StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,306 Commits 1 Branch 0 Tags
e80e8b4c5cbde72338ee6e88d3b51a5f36656be2
Commit Graph

8595 Commits

Author SHA1 Message Date
Bill Napier
00b31bee97 am fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build." 
Merge commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31' into gingerbread-plus-aosp

* commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31':
  Add in MonkeyRunner target (and dependent libs) to SDK build.
 2010-10-11 15:30:09 -07:00
Bill Napier
8921ea6982 am 04345cb1: Add in MonkeyRunner target (and dependent libs) to SDK build. 
Merge commit '04345cb1147f220c67410c16b362223b1e8952f7'

* commit '04345cb1147f220c67410c16b362223b1e8952f7':
  Add in MonkeyRunner target (and dependent libs) to SDK build.
 2010-10-11 10:21:10 -07:00
Xavier Ducrohet
a0eb715ab0 am 747bc08a: Merge "Add all languages to the SDK image." into gingerbread 
Merge commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b' into gingerbread-plus-aosp

* commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b':
  Add all languages to the SDK image.
 2010-10-10 14:37:00 -07:00
Xavier Ducrohet
747bc08a8e Merge "Add all languages to the SDK image." into gingerbread 2010-10-10 14:31:10 -07:00
Xavier Ducrohet
8d3559ee91 Add all languages to the SDK image. 
Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4
 2010-10-10 14:14:49 -07:00
Bill Napier
0e9473acfb Add in MonkeyRunner target (and dependent libs) to SDK build. 
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
 2010-10-10 12:06:57 -07:00
Bill Napier
04345cb114 Add in MonkeyRunner target (and dependent libs) to SDK build. 
Change-Id: I6aa0b1e48dfd0017b3c68fb3b25c02b703ecbd53
 2010-10-08 17:37:29 -07:00
Jean-Baptiste Queru
9e0892c350 Cherry-pick 547b902e 
"am d29f5df3: Merge "Add TTS language files to the full build." into gingerbread"

Change-Id: Iea988350124dacf085244addf34a6f216b58cf77
 2010-10-08 07:39:07 -07:00
Jean-Baptiste Queru
be24f6f800 Cheryr-pick of 424de177 
"resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp"

Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa
 2010-10-08 07:32:59 -07:00
Jean-Baptiste Queru
547b902e99 am d29f5df3: Merge "Add TTS language files to the full build." into gingerbread 
Merge commit 'd29f5df3663acb01f88347b67056d969e2d49d15' into gingerbread-plus-aosp

* commit 'd29f5df3663acb01f88347b67056d969e2d49d15':
  Add TTS language files to the full build.
 2010-10-07 15:48:02 -07:00
Jean-Baptiste Queru
424de1779d resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp 
Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
 2010-10-07 15:00:12 -07:00
Jean-Baptiste Queru
0b44f50d5f Add TTS language files to the full build. 
Bug: 3065214
Change-Id: I5c324965e693fe26d686b92d869e33facc92c762
 2010-10-06 08:05:44 -07:00
Dianne Hackborn
3afdaa8507 am 3367df34: am 2f85f654: Merge "Add location shared library to core build." into gingerbread 
Merge commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'

* commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
  Add location shared library to core build.
 2010-09-28 17:40:09 -07:00
Dianne Hackborn
3367df348c am 2f85f654: Merge "Add location shared library to core build." into gingerbread 
Merge commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp

* commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5':
  Add location shared library to core build.
 2010-09-28 17:19:25 -07:00
Dianne Hackborn
588fab8bbc Add location shared library to core build. 
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
 2010-09-28 14:25:05 -07:00
Jean-Baptiste Queru
05496fff27 resolved conflicts for merge of 9bfa95cf to master 
Change-Id: I70cfcd1de8a9d56900f81c174e33e433bae0508d
 2010-09-28 07:20:52 -07:00
Jean-Baptiste Queru
9bfa95cfff am 6bc232a1: Merge "Don\'t reference CarHome and CarHomeLauncher" into gingerbread 
Merge commit '6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp

* commit '6bc232a11621740d14f517218d2599a714fb451f':
  Don't reference CarHome and CarHomeLauncher
 2010-09-27 17:28:24 -07:00
Jean-Baptiste Queru
102b8f46a5 Don't reference CarHome and CarHomeLauncher 
They're not actually part of AOSP

Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
 2010-09-27 17:04:41 -07:00
Jean-Baptiste Queru
8666dd63c7 Explicitly handle bluetooth files. 
This also allows to separate smartphone and nonsmartphone variants.

Change-Id: Icbd7c78a866bae32f060607f8a898d59fcd45830
 2010-09-27 15:35:33 -07:00
Mathias Agopian
e93e533218 add screencap to PRODUCT_PACKAGES 
Change-Id: Ibe0a436e80082788dfab9d43a45c99d9a87633aa
 2010-09-26 18:52:23 -07:00
Jean-Baptiste Queru
a737b8371d Explicitly request ip-up-vpn 
Change-Id: I05c1a3f75e9a2b9040fda3e00f0b659c613968b1
 2010-09-26 10:07:09 -07:00
Ying Wang
44f4021041 Add wpa_supplicant.conf to the core.mk 
Note that wpa_supplicant.conf will only be built only if the wpa_supplicant_conf.mk
is included with some conditionals.
Bug: 3003508

Change-Id: I3d1a705c5ff5fd23a8828d5aa756ab2e4edcf4d2
 2010-09-24 11:14:16 -07:00
Jesse Wilson
fed45d859a am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS. 
Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'

* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
  Turn dalvikvm host builds on by default when linux is the host OS.
 2010-09-22 13:53:41 -07:00
Jesse Wilson
77070aa757 am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS. 
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp

* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
  Turn dalvikvm host builds on by default when linux is the host OS.
 2010-09-22 11:55:29 -07:00
Jesse Wilson
ce7d5023c3 Turn dalvikvm host builds on by default when linux is the host OS. 
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.

Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
 2010-09-22 11:39:18 -07:00
Ying Wang
03e76ace38 Add a new layer generic_no_telephony.mk 
Bug: 2994028
Change-Id: I2a1831bb8dd1245c6cc0116738c118fe895b6e43
 2010-09-21 16:28:29 -07:00
Steve Howard
a188df5cd7 am 1a297b84: am 1020d271: Add new downloads UI to core build. 
Merge commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba'

* commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba':
  Add new downloads UI to core build.
 2010-09-20 11:57:10 -07:00
Steve Howard
1a297b84c8 am 1020d271: Add new downloads UI to core build. 
Merge commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp

* commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197':
  Add new downloads UI to core build.
 2010-09-20 11:52:57 -07:00
Steve Howard
1020d271c6 Add new downloads UI to core build. 
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
 2010-09-20 11:44:54 -07:00
Brian Carlstrom
6821dbad65 Only turn host build on for linux 
Change-Id: I2d3b16f7881ad82cf272a40213dd4e173f54baa0
 2010-09-16 22:49:10 -07:00
Brian Carlstrom
cec75adb64 am c05d0000: Only turn host build on for linux 
Merge commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2' into gingerbread-plus-aosp

* commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2':
  Only turn host build on for linux
 2010-09-16 22:13:50 -07:00
Brian Carlstrom
c05d0000bb Only turn host build on for linux 
Change-Id: I595948b159bc6a2bf295fd11ab831f978e38c799
 2010-09-16 21:49:01 -07:00
Jesse Wilson
8caaeddcc0 resolved conflicts for merge of d9de6588 to master 
Change-Id: I3d7d6744b4f0d7c10bf001c87c0abbb4cb6885ef
 2010-09-16 17:57:47 -07:00
Jesse Wilson
d9de658868 am 852f43bd: Include dalvik+libcore dependencies in core product definitions. 
Merge commit '852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp

* commit '852f43bd29da34ff15799b88c3db166428cea6d8':
  Include dalvik+libcore dependencies in core product definitions.
 2010-09-16 17:48:29 -07:00
Jesse Wilson
852f43bd29 Include dalvik+libcore dependencies in core product definitions. 
Also conditionally include host-only dependencies when the host is
being built.

Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
 2010-09-16 15:34:00 -07:00
Jean-Baptiste Queru
1eeec7cb41 am 24ab0f58: am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread 
Merge commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96'

* commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96':
  Allow devices without AndroidBoard.mk
 2010-09-15 17:53:46 -07:00
Jean-Baptiste Queru
24ab0f58f4 am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread 
Merge commit '85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp

* commit '85f351d1f925b265c401f1992b57dc028d462453':
  Allow devices without AndroidBoard.mk
 2010-09-15 12:56:42 -07:00
Jean-Baptiste Queru
3f4e53aa25 Allow devices without AndroidBoard.mk 
A long time ago, Android.mk in devices had the same semantics
as the current AndroidBoard.mk. This eventually caused problems
(as it didn't allow having a true Android.mk there) so we switched,
and left an error behind in case people were still using the old
semantics (i.e. having an Android.mk but no AndroidBoard.mk).

Fast forward a few years to the present: we're finding that we want
to get rid of AndroidBoard.mk, so there are devices that will have
Android.mk but not AndroidBoard.mk. As this is becoming a legitimate
case, the error for it is removed, and the include for AndroidBoard.mk
is made optional.

Change-Id: Ic683419d4aaab122259715e0112660d2a6359e91
 2010-09-15 11:59:33 -07:00
Jean-Baptiste Queru
12722d34c8 Merge "Explicitly manage fonts and ICU data" 2010-09-15 09:53:05 -07:00
Ying Wang
8e052ff521 am f6332cfa: am b125c81c: Refine the comment. 
Merge commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1'

* commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1':
  Refine the comment.
 2010-09-15 07:06:36 -07:00
Jean-Baptiste Queru
c9c3fd3043 Explicitly manage fonts and ICU data 
Change-Id: I2fa61378956ccc230b4268b4cc201e7e9950f111
 2010-09-14 14:42:10 -07:00
Jean-Baptiste Queru
30dfc9a6b8 Revert "Explicitly manage fonts and ICU data" 
This reverts commit b315d46bc8.
 2010-09-14 14:08:00 -07:00
Jean-Baptiste Queru
b315d46bc8 Explicitly manage fonts and ICU data 
Change-Id: If08edf37f06d9978326202797c52a0cae2f71d3e
 2010-09-14 13:01:08 -07:00
Jean-Baptiste Queru
0dfe1884ba merge dd1d0016 to master 
Change-Id: Ib83cd76a959fa6209f4920021d3dbf5d61fa6b8e
 2010-09-14 09:52:29 -07:00
Ying Wang
f6332cfaf2 am b125c81c: Refine the comment. 
Merge commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87' into gingerbread-plus-aosp

* commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87':
  Refine the comment.
 2010-09-14 09:43:03 -07:00
Ying Wang
dd1d00163c am 69de539a: Add host modules needed by SDK build. 
Merge commit '69de539a091bc035e0e2d67f2282450a6b4966bd' into gingerbread-plus-aosp

* commit '69de539a091bc035e0e2d67f2282450a6b4966bd':
  Add host modules needed by SDK build.
 2010-09-14 09:43:01 -07:00
Ying Wang
b125c81cfc Refine the comment. 
The host tools include script as well as native binaries.

Change-Id: I8bdd62bf5117ac71e2607d2cb4cd7b08bcbe7b14
 2010-09-13 18:33:31 -07:00
Ying Wang
69de539a09 Add host modules needed by SDK build. 
Since host module tag is defaulted to optional now, we have to explicitly
add those modules to the SDK product config file.

Change-Id: I8f6c4dcb17ef7716ae3590d6e96ddd5d07cc0582
 2010-09-13 18:11:11 -07:00
Dmitry Shmidt
738dbba83d Add "ip" utility to all builds 
Change-Id: Iad392d127bd7f6ee014710a9c7479e3aaa92e743
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2010-09-13 16:54:37 -07:00
Jean-Baptiste Queru
fe648a9f58 manual merge 
Change-Id: Iafb6e494f28050c960185656d4d630a6c27b6efe
 2010-09-01 06:33:19 -07:00