OSDN Git Service
Xavier Ducrohet [Sun, 10 Oct 2010 21:37:00 +0000 (14:37 -0700)]
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.
Xavier Ducrohet [Sun, 10 Oct 2010 21:31:10 +0000 (14:31 -0700)]
Merge "Add all languages to the SDK image." into gingerbread
Xavier Ducrohet [Sun, 10 Oct 2010 21:14:49 +0000 (14:14 -0700)]
Add all languages to the SDK image.
Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4
Bill Napier [Sat, 9 Oct 2010 00:37:29 +0000 (17:37 -0700)]
Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I6aa0b1e48dfd0017b3c68fb3b25c02b703ecbd53
Brian Muramatsu [Thu, 7 Oct 2010 22:48:15 +0000 (15:48 -0700)]
am
cd7170d7: resolved conflicts for merge of
0f8fcbe2 to gingerbread
Merge commit '
cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp
* commit '
cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959':
Support Additional CTS Host Jars
Jean-Baptiste Queru [Thu, 7 Oct 2010 22:48:02 +0000 (15:48 -0700)]
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.
Jean-Baptiste Queru [Thu, 7 Oct 2010 22:00:12 +0000 (15:00 -0700)]
resolved conflicts for merge of
0f085e5a to gingerbread-plus-aosp
Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
Brian Muramatsu [Thu, 7 Oct 2010 21:31:21 +0000 (14:31 -0700)]
resolved conflicts for merge of
0f8fcbe2 to gingerbread
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
Jean-Baptiste Queru [Thu, 7 Oct 2010 21:26:31 +0000 (14:26 -0700)]
Merge "Add TTS language files to the full build." into gingerbread
Jean-Baptiste Queru [Thu, 7 Oct 2010 21:16:35 +0000 (14:16 -0700)]
Merge "Explicitly request ip-up-vpn"
Ying Wang [Thu, 7 Oct 2010 20:57:29 +0000 (13:57 -0700)]
am
83f69eb5: Prepend ccache to CC/CXX if necessary.
Merge commit '
83f69eb5f905d47581bed141b7f5103362390339' into gingerbread-plus-aosp
* commit '
83f69eb5f905d47581bed141b7f5103362390339':
Prepend ccache to CC/CXX if necessary.
Dima Zavin [Thu, 7 Oct 2010 20:57:24 +0000 (13:57 -0700)]
am
4477db78: CHERRY-PICK: propogate module tags for prebuilts
Merge commit '
4477db7883dfa21aa423f29057511fdb804c46af' into gingerbread-plus-aosp
* commit '
4477db7883dfa21aa423f29057511fdb804c46af':
CHERRY-PICK: propogate module tags for prebuilts
Brian Muramatsu [Thu, 7 Oct 2010 19:51:33 +0000 (12:51 -0700)]
Merge CTS-related change
Change-Id: I622b2647f075a8cefe82f0373e2f37b6ca7e6e4b
Ying Wang [Thu, 7 Oct 2010 17:45:02 +0000 (10:45 -0700)]
Prepend ccache to CC/CXX if necessary.
In case TARGET_CC is assigned with HOST_CC (eg, simulator build),
ccache will be prepended twice before this CL.
Bug:
3069576
Change-Id: I2ee44faea3a2795cf389ad6f80e4066a02b43be9
Dima Zavin [Thu, 16 Sep 2010 05:03:26 +0000 (22:03 -0700)]
CHERRY-PICK: propogate module tags for prebuilts
Change-Id: I08f1ae2ae4bb47a393cf5de1ed616d76fcd961c9
Signed-off-by: Dima Zavin <dima@android.com>
Joe Onorato [Thu, 7 Oct 2010 14:09:25 +0000 (07:09 -0700)]
am
700b88e1: Pass device characteristic information through to aapt.
Merge commit '
700b88e1451f216d137d8a356496bf51712512c6' into gingerbread-plus-aosp
* commit '
700b88e1451f216d137d8a356496bf51712512c6':
Pass device characteristic information through to aapt.
Jean-Baptiste Queru [Wed, 6 Oct 2010 15:05:44 +0000 (08:05 -0700)]
Add TTS language files to the full build.
Bug:
3065214
Change-Id: I5c324965e693fe26d686b92d869e33facc92c762
Joe Onorato [Tue, 5 Oct 2010 21:33:58 +0000 (17:33 -0400)]
Pass device characteristic information through to aapt.
A build configuration can define PRODUCT_CHARACTERISTICS, which is
a comma-separated list of device characteristics, for example
"nosdcard,grayscale". This will be passed through to aapt with
the --product flag.
Change-Id: I902c034b2f2824dbd2d33449308ee08beeb09551
Ying Wang [Wed, 6 Oct 2010 01:12:51 +0000 (18:12 -0700)]
am
476d70ae: Clean step for CL 71822
Merge commit '
476d70aece4395dc29288c3d647c64732d3a6d3d' into gingerbread-plus-aosp
* commit '
476d70aece4395dc29288c3d647c64732d3a6d3d':
Clean step for CL 71822
Ying Wang [Wed, 6 Oct 2010 01:07:29 +0000 (18:07 -0700)]
Clean step for CL 71822
Change-Id: Iddbefa915cdde0cc403134711b6ffd056c402db2
Brian Muramatsu [Thu, 2 Sep 2010 19:36:59 +0000 (12:36 -0700)]
Support Additional CTS Host Jars
Include another optional Makefile from the CTS project that
specifies additional JARs that the CTS host may need. This
will make it easier to create modules in the CTS project
that can be built for the host and device and shared between
the host and test cases.
The first such library will include annotations like
"RequiresFeature" and "SupportsProfile" that will be needed
to support multiple device profiles in CTS.
Another planned libraries could include defining the CTS
version number in a central spot and sharing code used to
probe for certain properties like the OpenGL version and
other system properties.
Can be checked in after this other change without causing
breakage: https://review.source.android.com/#change,16740
Change-Id: I3c488247b66522dc86277ab43198c34f790e0618
Ying Wang [Sun, 3 Oct 2010 03:08:55 +0000 (20:08 -0700)]
am
a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.
Merge commit '
a9c381ed4517993175a5bb6741ecf2aac3e8040c' into gingerbread-plus-aosp
* commit '
a9c381ed4517993175a5bb6741ecf2aac3e8040c':
Any intermediate targets between Progaurd and the built_dex should be differently named.
Ying Wang [Sun, 3 Oct 2010 01:35:51 +0000 (18:35 -0700)]
Any intermediate targets between Progaurd and the built_dex should be differently named.
Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841
To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.
Ying Wang [Fri, 1 Oct 2010 22:51:35 +0000 (15:51 -0700)]
am
a83940fa: Move odex related files to product-specific dir.
Merge commit '
a83940fa7851b35712e559be2246b56b5666b805' into gingerbread-plus-aosp
* commit '
a83940fa7851b35712e559be2246b56b5666b805':
Move odex related files to product-specific dir.
Ying Wang [Sat, 25 Sep 2010 01:09:04 +0000 (18:09 -0700)]
Move odex related files to product-specific dir.
For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar
and the .odex file, if dexpreopt is enabled.
These 2 files are moved to a product-specific dir in this change.
For target Java Libraries, $(intermediates) now points to the product-specific dir.
There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency.
Nothing is changed for host Java libraries.
Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
Brian Carlstrom [Thu, 30 Sep 2010 22:02:49 +0000 (15:02 -0700)]
am
46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread
Merge commit '
46fc2341c535ba624fd2dceec9399ce681a80866' into gingerbread-plus-aosp
* commit '
46fc2341c535ba624fd2dceec9399ce681a80866':
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Brian Carlstrom [Thu, 30 Sep 2010 22:00:31 +0000 (15:00 -0700)]
Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread
Brian Carlstrom [Thu, 30 Sep 2010 21:41:54 +0000 (14:41 -0700)]
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Change-Id: I8915bc1c9f52a3b6ab1a82b404ab61cd0726198d
Xavier Ducrohet [Thu, 30 Sep 2010 20:20:04 +0000 (13:20 -0700)]
am
f51f24a6: Use the new sdk/build/tools.atree.
Merge commit '
f51f24a6ea5d972dcaf60f882c26a0a08c9014fc' into gingerbread-plus-aosp
* commit '
f51f24a6ea5d972dcaf60f882c26a0a08c9014fc':
Use the new sdk/build/tools.atree.
Xavier Ducrohet [Mon, 27 Sep 2010 22:51:32 +0000 (15:51 -0700)]
Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.
Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.
Change-Id: I9158501cd68783d593e49e5fdea7f17d19b0120f
Ying Wang [Thu, 30 Sep 2010 16:31:38 +0000 (09:31 -0700)]
am
0b9382c7: Separate out Proguard flag files to fix dependency.
Merge commit '
0b9382c792c303a93f5805adf4eba377dac01950' into gingerbread-plus-aosp
* commit '
0b9382c792c303a93f5805adf4eba377dac01950':
Separate out Proguard flag files to fix dependency.
Xavier Ducrohet [Thu, 30 Sep 2010 15:52:16 +0000 (08:52 -0700)]
am
ffd5087e: Use the new sdk/build/tools.atree.
Merge commit '
ffd5087ec81a281b1299048b4282dad593ccd703' into gingerbread-plus-aosp
* commit '
ffd5087ec81a281b1299048b4282dad593ccd703':
Use the new sdk/build/tools.atree.
Ying Wang [Wed, 29 Sep 2010 21:50:41 +0000 (14:50 -0700)]
Separate out Proguard flag files to fix dependency.
Bug:
3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
Dan Bornstein [Wed, 29 Sep 2010 19:53:24 +0000 (12:53 -0700)]
am
c8c09e28: Inform dex-preopt when the target device is a uniprocessor.
Merge commit '
c8c09e285d59f73334267deb9502c0927c616837' into gingerbread-plus-aosp
* commit '
c8c09e285d59f73334267deb9502c0927c616837':
Inform dex-preopt when the target device is a uniprocessor.
Dan Bornstein [Wed, 29 Sep 2010 18:54:15 +0000 (11:54 -0700)]
Inform dex-preopt when the target device is a uniprocessor.
By default, dex-preopt optimizes for an SMP target.
Change-Id: Ib92552e55f5426b9b035ce862233752af090bb43
Brian Carlstrom [Wed, 29 Sep 2010 00:50:49 +0000 (17:50 -0700)]
am
ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit '
ea83daa389aea493294617232b5c34414861d701' into gingerbread-plus-aosp
* commit '
ea83daa389aea493294617232b5c34414861d701':
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Brian Carlstrom [Wed, 29 Sep 2010 00:45:59 +0000 (17:45 -0700)]
Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Ying Wang [Wed, 29 Sep 2010 00:36:46 +0000 (17:36 -0700)]
am
879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread
Merge commit '
879779a5806d6e09d1c852a93dd4e1793bbd96cd' into gingerbread-plus-aosp
* commit '
879779a5806d6e09d1c852a93dd4e1793bbd96cd':
framework-res is not used as regular Java library now.
Ying Wang [Wed, 29 Sep 2010 00:32:36 +0000 (17:32 -0700)]
Merge "framework-res is not used as regular Java library now." into gingerbread
Ying Wang [Wed, 29 Sep 2010 00:27:56 +0000 (17:27 -0700)]
framework-res is not used as regular Java library now.
Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb
Dianne Hackborn [Wed, 29 Sep 2010 00:19:25 +0000 (17:19 -0700)]
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.
Dianne Hackborn [Wed, 29 Sep 2010 00:14:39 +0000 (17:14 -0700)]
Merge "Add location shared library to core build." into gingerbread
Ying Wang [Tue, 28 Sep 2010 23:25:15 +0000 (16:25 -0700)]
am
e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit '
e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp
* commit '
e1926260486707b3941b5488e97307f7904d1c99':
Treat prebuilt SDKs and the stub as normal java libraries.
Ying Wang [Tue, 28 Sep 2010 23:18:03 +0000 (16:18 -0700)]
Treat prebuilt SDKs and the stub as normal java libraries.
Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
Dianne Hackborn [Tue, 28 Sep 2010 21:25:05 +0000 (14:25 -0700)]
Add location shared library to core build.
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
Brian Carlstrom [Fri, 17 Sep 2010 19:25:50 +0000 (12:25 -0700)]
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Change-Id: I3dfc1aa6f10a52c2adc68259ce1cedec2ffd8f0e
Ying Wang [Tue, 28 Sep 2010 01:05:22 +0000 (18:05 -0700)]
am
bb2b82bd: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread
Merge commit '
bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp
* commit '
bb2b82bd557b157fea5e280ef50ee782d15ac032':
Fix userdata partition's ext4 mount point to data.
Ying Wang [Tue, 28 Sep 2010 01:03:52 +0000 (18:03 -0700)]
Merge "Fix userdata partition's ext4 mount point to data." into gingerbread
Brett Chabot [Tue, 28 Sep 2010 00:49:46 +0000 (17:49 -0700)]
am
ef5fd0e1: Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Merge commit '
ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2' into gingerbread-plus-aosp
* commit '
ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2':
Package ddmlib-prebuilt with CTS.
Ying Wang [Tue, 28 Sep 2010 00:49:03 +0000 (17:49 -0700)]
Fix userdata partition's ext4 mount point to data.
Bug:
3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
Brett Chabot [Tue, 28 Sep 2010 00:47:55 +0000 (17:47 -0700)]
Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Xavier Ducrohet [Wed, 28 Jul 2010 18:07:31 +0000 (11:07 -0700)]
Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:28:24 +0000 (17:28 -0700)]
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
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:24:02 +0000 (17:24 -0700)]
Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:04:41 +0000 (17:04 -0700)]
Don't reference CarHome and CarHomeLauncher
They're not actually part of AOSP
Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
Ying Wang [Mon, 27 Sep 2010 23:33:43 +0000 (16:33 -0700)]
am
1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '
1fdbf261a0d550baaed96f5461bb014754364c16' into gingerbread-plus-aosp
* commit '
1fdbf261a0d550baaed96f5461bb014754364c16':
Don't set DISABLE_DEXPREOPT in lunch.
Ying Wang [Mon, 27 Sep 2010 23:25:11 +0000 (16:25 -0700)]
Don't set DISABLE_DEXPREOPT in lunch.
Because in core/main.mk WITH_DEXPREOPT is set to true only if the build OS is linux.
Change-Id: I287ab61312667f6100371d07010bcab5cfcc7e17
Xavier Ducrohet [Mon, 27 Sep 2010 22:51:32 +0000 (15:51 -0700)]
Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.
Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.
Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
Ying Wang [Mon, 27 Sep 2010 21:59:13 +0000 (14:59 -0700)]
am
30090e41: Set the intermediate dirs before using them.
Merge commit '
30090e41e31e7db34a1092d8173c1413c036b49d' into gingerbread-plus-aosp
* commit '
30090e41e31e7db34a1092d8173c1413c036b49d':
Set the intermediate dirs before using them.
Ying Wang [Mon, 27 Sep 2010 21:53:39 +0000 (14:53 -0700)]
Set the intermediate dirs before using them.
Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
Ying Wang [Mon, 27 Sep 2010 21:10:53 +0000 (14:10 -0700)]
am
9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Merge commit '
9049e321aec53cfb23b63bbee7c21878a087350f' into gingerbread-plus-aosp
* commit '
9049e321aec53cfb23b63bbee7c21878a087350f':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Ying Wang [Mon, 27 Sep 2010 21:07:17 +0000 (14:07 -0700)]
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
So the its target-specific PRIVATE vars can be set properly.
Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
Ying Wang [Mon, 27 Sep 2010 18:52:45 +0000 (11:52 -0700)]
am
02352378: Remove emulator-based dexpreopt logic from the build system.
Merge commit '
0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp
* commit '
0235237805991b48831dc8add072a50c478b2fcb':
Remove emulator-based dexpreopt logic from the build system.
Ying Wang [Mon, 27 Sep 2010 17:37:25 +0000 (10:37 -0700)]
Remove emulator-based dexpreopt logic from the build system.
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:39:11 +0000 (17:39 -0700)]
am
97984c41: reconcile froyo-release into gingerbread
Merge commit '
97984c41fe4f8fdca1f24c7bf790bf03b174f90e' into gingerbread-plus-aosp
* commit '
97984c41fe4f8fdca1f24c7bf790bf03b174f90e':
FRG83
FRG78
FRG75
FRG58B
FRG58
FRG57
include build timestamp in OTA metadata
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:28:49 +0000 (17:28 -0700)]
reconcile froyo-release into gingerbread
Change-Id: If6c3b341b0716ef4f80721da2635b7bde45f453d
Doug Zongker [Sun, 26 Sep 2010 22:09:54 +0000 (15:09 -0700)]
am
96a57e73: make info_dict and GetTypeAndDevice available to device extensions
Merge commit '
96a57e737707d05333dced5b657c4ef21c44088a' into gingerbread-plus-aosp
* commit '
96a57e737707d05333dced5b657c4ef21c44088a':
make info_dict and GetTypeAndDevice available to device extensions
Doug Zongker [Sun, 26 Sep 2010 21:57:41 +0000 (14:57 -0700)]
make info_dict and GetTypeAndDevice available to device extensions
Change-Id: I3aa04cb6d7988fc1fdd7f179634b09ceab5749fb
Ying Wang [Sun, 26 Sep 2010 20:47:45 +0000 (13:47 -0700)]
am
1448b0b7: Remove emulator-based dexpreopt code
Merge commit '
1448b0b7023a43ff4461cc66d25230c9b6502724' into gingerbread-plus-aosp
* commit '
1448b0b7023a43ff4461cc66d25230c9b6502724':
Remove emulator-based dexpreopt code
Ying Wang [Sun, 26 Sep 2010 20:11:16 +0000 (13:11 -0700)]
Remove emulator-based dexpreopt code
Now dexpreopt is done on the host side.
Change-Id: I1ea1a5d1fac2531028e017364ef870abb7420be7
Jean-Baptiste Queru [Sun, 26 Sep 2010 17:07:09 +0000 (10:07 -0700)]
Explicitly request ip-up-vpn
Change-Id: I05c1a3f75e9a2b9040fda3e00f0b659c613968b1
Ying Wang [Sat, 25 Sep 2010 01:12:12 +0000 (18:12 -0700)]
am
d56d69b6: Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
Merge commit '
d56d69b621bf41b478d59b6f987b6f796a9d8652' into gingerbread-plus-aosp
* commit '
d56d69b621bf41b478d59b6f987b6f796a9d8652':
Fix dependency when switching between build variants with and without Proguard.
Ying Wang [Sat, 25 Sep 2010 01:08:30 +0000 (18:08 -0700)]
Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
Ying Wang [Fri, 24 Sep 2010 21:00:50 +0000 (14:00 -0700)]
am
19f9c1c2: Fix nothing-to-do build.
Merge commit '
19f9c1c243262aa3c16cba026a82ad53aa2818ac' into gingerbread-plus-aosp
* commit '
19f9c1c243262aa3c16cba026a82ad53aa2818ac':
Fix nothing-to-do build.
Ying Wang [Fri, 24 Sep 2010 20:56:45 +0000 (13:56 -0700)]
Fix nothing-to-do build.
Because .odex is always newer than the .jar file, so we should use "|" depdendency here.
Change-Id: Ied4c5ec4ee3294862c0a232f96c15cca2c748e11
Andy McFadden [Fri, 24 Sep 2010 19:33:50 +0000 (12:33 -0700)]
am
6474811d: Fix sim-eng build.
Merge commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp
* commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2':
Fix sim-eng build.
Andy McFadden [Fri, 24 Sep 2010 19:04:17 +0000 (12:04 -0700)]
Fix sim-eng build.
Don't try to do the host build if we're configured for sim-eng. They
seem to be clashing, and it's redundant anyway.
Change-Id: I8e1a24b6e07d28701b32b6559ba39337b211264d
Ficus Kirkpatrick [Fri, 24 Sep 2010 18:09:40 +0000 (11:09 -0700)]
am
e7f8140e: am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f' into gingerbread-plus-aosp
* commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f':
Add a workaround for a platform JAR parsing bug.
Ficus Kirkpatrick [Fri, 24 Sep 2010 17:58:04 +0000 (10:58 -0700)]
am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
7978d50edb9c4da0b8f4076412f092418da6e372' into gingerbread
* commit '
7978d50edb9c4da0b8f4076412f092418da6e372':
Add a workaround for a platform JAR parsing bug.
Ficus Kirkpatrick [Fri, 24 Sep 2010 05:57:05 +0000 (22:57 -0700)]
Add a workaround for a platform JAR parsing bug.
The java.util.jar implementation through Android 1.6 has a
bug where if the signature file in META-INF is a multiple
of 1024 bytes, it will throw an IOException attempting to
read it.
If signapk would produce a CERT.SF in a multiple of 1024
bytes, add an extra CRLF to the end of the file.
Bug:
3019677
Change-Id: I23d4a36e12e224be600d3ac39379b5b5a022a628
Ying Wang [Fri, 24 Sep 2010 01:05:38 +0000 (18:05 -0700)]
am
02c9813a: Prebuilt NDKs are merged for linux and darwin.
Merge commit '
02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp
* commit '
02c9813a726803e1c406b19f6b9dc4e411326e66':
Prebuilt NDKs are merged for linux and darwin.
Ying Wang [Fri, 24 Sep 2010 00:59:36 +0000 (17:59 -0700)]
Prebuilt NDKs are merged for linux and darwin.
Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
Ying Wang [Thu, 23 Sep 2010 18:48:38 +0000 (11:48 -0700)]
Fix dependency when switching between build variants with and without Proguard.
With this change, in a user build the dependency looks like:
package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar
While in an eng build:
package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar
Because package.apk is product-specific and removed when switching between
user and eng builds, it can always be built with the correct and up-to-date .dex file.
Bug:
3022484
Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
Ying Wang [Thu, 23 Sep 2010 23:42:38 +0000 (16:42 -0700)]
am
50d7d7a0: Fix private vars for host-dex rules.
Merge commit '
50d7d7a0a68378d1b02b5d2a2514592ba0d65f84' into gingerbread-plus-aosp
* commit '
50d7d7a0a68378d1b02b5d2a2514592ba0d65f84':
Fix private vars for host-dex rules.
Ying Wang [Thu, 23 Sep 2010 23:29:53 +0000 (16:29 -0700)]
Fix private vars for host-dex rules.
Change-Id: Ie374d3abf4c261b9c5e8b80ed464b4c6b1b52b42
Dmitry Shmidt [Thu, 23 Sep 2010 18:34:33 +0000 (11:34 -0700)]
am
fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit '
fb148d31eaab585c377e3b6be7a5c94380d623e0' into gingerbread-plus-aosp
* commit '
fb148d31eaab585c377e3b6be7a5c94380d623e0':
user_tags: Remove 01-test target
Dmitry Shmidt [Thu, 23 Sep 2010 18:06:42 +0000 (11:06 -0700)]
Merge "user_tags: Remove 01-test target" into gingerbread
Ying Wang [Thu, 23 Sep 2010 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for merge of
b368bba4 to gingerbread-plus-aosp
Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
Ying Wang [Wed, 22 Sep 2010 23:57:01 +0000 (16:57 -0700)]
am
e7874c43: Integrate dexpreopt into the build system.
Merge commit '
e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp
* commit '
e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
Ying Wang [Fri, 17 Sep 2010 23:36:06 +0000 (16:36 -0700)]
Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
Dmitry Shmidt [Wed, 22 Sep 2010 22:43:21 +0000 (15:43 -0700)]
user_tags: Remove 01-test target
Auto-merge: no
Change-Id: I5e573660cdb4696951bcf62b611cfa71bb8395db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Wed, 22 Sep 2010 20:14:49 +0000 (13:14 -0700)]
am
38a3161d: String literal change.
Merge commit '
38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp
* commit '
38a3161dc7f5fec81df9412bc202c3962c74535d':
String literal change.
Ying Wang [Wed, 22 Sep 2010 19:56:13 +0000 (12:56 -0700)]
String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
Jesse Wilson [Wed, 22 Sep 2010 18:55:29 +0000 (11:55 -0700)]
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.
Jesse Wilson [Wed, 22 Sep 2010 17:59:10 +0000 (10:59 -0700)]
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
Ying Wang [Thu, 8 Jul 2010 01:12:25 +0000 (18:12 -0700)]
Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
Doug Zongker [Wed, 22 Sep 2010 17:18:33 +0000 (10:18 -0700)]
am
780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '
780c2372706c5250079cb7d759f6530691dd9143' into gingerbread-plus-aosp
* commit '
780c2372706c5250079cb7d759f6530691dd9143':
accommodate both new and old target-files when creating incrementals (do not merge)
Doug Zongker [Wed, 22 Sep 2010 17:12:54 +0000 (10:12 -0700)]
accommodate both new and old target-files when creating incrementals (do not merge)
Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
Doug Zongker [Wed, 22 Sep 2010 00:25:59 +0000 (17:25 -0700)]
am
ad806982: arg: system_size, not system_img
Merge commit '
ad806982c12b64d8dff040f5c9a444d810d7694c' into gingerbread-plus-aosp
* commit '
ad806982c12b64d8dff040f5c9a444d810d7694c':
arg: system_size, not system_img
Doug Zongker [Wed, 22 Sep 2010 00:22:14 +0000 (17:22 -0700)]
arg: system_size, not system_img
Change-Id: Iba5d10204c93159a4f12ea8e8d8687db5b9dd5ca