OSDN Git Service
The Android Automerger [Tue, 19 Oct 2010 14:44:02 +0000 (07:44 -0700)]
HRH19
Change-Id: Ie9a356801bdf2a06d39fd451f6d88a3d0908f286
android-build SharedAccount [Mon, 18 Oct 2010 23:43:17 +0000 (16:43 -0700)]
HRH18B
Change-Id: I5440cf10ed562efd9aea45e150d5543d4e8a8c3a
The Android Automerger [Mon, 18 Oct 2010 16:36:03 +0000 (09:36 -0700)]
HRH18
Change-Id: I98672375bec0ef8700c7b960a796df6cff64f5c4
The Android Automerger [Mon, 18 Oct 2010 16:35:03 +0000 (09:35 -0700)]
Merge branch 'master' into honeycomb-release
Scott Main [Sun, 17 Oct 2010 18:17:33 +0000 (11:17 -0700)]
am
67206677: (-s ours) am
c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Merge commit '
672066778bdf3aacdd859b88484cddbd6c8b7909'
* commit '
672066778bdf3aacdd859b88484cddbd6c8b7909':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Nick Pelly [Sun, 17 Oct 2010 18:17:24 +0000 (11:17 -0700)]
Scott Main [Sat, 16 Oct 2010 01:22:09 +0000 (18:22 -0700)]
am
c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Merge commit '
c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp
* commit '
c0aa1e1b305d85baef1dcedabbea1d084f3ed54a':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Nick Pelly [Sat, 16 Oct 2010 01:21:29 +0000 (18:21 -0700)]
am
e07a9d4a: Always install libnfc_ndef.
Merge commit '
e07a9d4aa4afd27461877fbfd4b132a5c6c34954' into gingerbread-plus-aosp
* commit '
e07a9d4aa4afd27461877fbfd4b132a5c6c34954':
Always install libnfc_ndef.
android-build SharedAccount [Fri, 15 Oct 2010 22:19:16 +0000 (15:19 -0700)]
HRH15B
Change-Id: Ia2f2c53c2ca72cb8e5790259696cc611c68a0156
Xavier Ducrohet [Fri, 15 Oct 2010 20:40:46 +0000 (13:40 -0700)]
am
bf4643e2: am
1aff79ad: Add SystemUI (notification bar) to SDK build.
Merge commit '
bf4643e2df9aafabca103f9242b5e7c7da9ded58'
* commit '
bf4643e2df9aafabca103f9242b5e7c7da9ded58':
Add SystemUI (notification bar) to SDK build.
Scott Main [Fri, 15 Oct 2010 18:20:26 +0000 (11:20 -0700)]
Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Scott Main [Fri, 15 Oct 2010 18:17:29 +0000 (11:17 -0700)]
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
Ying Wang [Fri, 15 Oct 2010 17:05:02 +0000 (10:05 -0700)]
Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only."
The Android Automerger [Fri, 15 Oct 2010 14:12:51 +0000 (07:12 -0700)]
HRH15
Change-Id: Ice00df39130609f51981a4162beaeb7901a03c63
Nick Pelly [Fri, 15 Oct 2010 08:01:20 +0000 (01:01 -0700)]
Always install libnfc_ndef.
libnfc_ndef is the (very small) library to implement NDEF message parsing.
Change-Id: Iab39a0904e1be2eb1fb07ef9f5cef5095c8a5b7b
Signed-off-by: Nick Pelly <npelly@google.com>
The Android Automerger [Thu, 14 Oct 2010 20:31:19 +0000 (13:31 -0700)]
HRH14
Change-Id: I963eb165033d5e86f1db9d9b7d2345cc34e7bd36
The Android Automerger [Thu, 14 Oct 2010 20:30:31 +0000 (13:30 -0700)]
Merge branch 'master' into honeycomb-release
Xavier Ducrohet [Thu, 14 Oct 2010 05:53:45 +0000 (22:53 -0700)]
am
1aff79ad: Add SystemUI (notification bar) to SDK build.
Merge commit '
1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d' into gingerbread-plus-aosp
* commit '
1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d':
Add SystemUI (notification bar) to SDK build.
android-build SharedAccount [Thu, 14 Oct 2010 00:57:23 +0000 (17:57 -0700)]
HRH13C
Change-Id: I8e945fb4b7b201dc4bd670348beb56f9662b003e
Xavier Ducrohet [Thu, 14 Oct 2010 00:26:29 +0000 (17:26 -0700)]
Add SystemUI (notification bar) to SDK build.
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
android-build SharedAccount [Wed, 13 Oct 2010 21:52:05 +0000 (14:52 -0700)]
HRH13B
Change-Id: Ib24a3d4d5fe202f64a292d48df1525f51bfffdea
Doug Zongker [Wed, 13 Oct 2010 20:39:56 +0000 (13:39 -0700)]
radio files aren't modules, prebuilt or otherwise
Change-Id: Ic21cf9f7d9657819e40c6700c98e61971dab24b4
The Android Automerger [Wed, 13 Oct 2010 13:49:31 +0000 (06:49 -0700)]
HRH13
Change-Id: Idcd849afc7e13718f3c5a846eb7d4a1fd74197b5
The Android Automerger [Wed, 13 Oct 2010 13:49:06 +0000 (06:49 -0700)]
Merge branch 'master' into honeycomb-release
Bill Napier [Tue, 12 Oct 2010 23:27:42 +0000 (16:27 -0700)]
am
00b31bee: am
fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Merge commit '
00b31bee97eb739b03eedddf1cd07a86b50259d8'
* commit '
00b31bee97eb739b03eedddf1cd07a86b50259d8':
Add in MonkeyRunner target (and dependent libs) to SDK build.
The Android Automerger [Tue, 12 Oct 2010 13:49:10 +0000 (06:49 -0700)]
HRH12
Change-Id: I7061e55061ad5ad6e52961e09e9b35a1c334f428
The Android Automerger [Tue, 12 Oct 2010 13:48:31 +0000 (06:48 -0700)]
Merge branch 'master' into honeycomb-release
Joe Onorato [Tue, 12 Oct 2010 00:12:46 +0000 (17:12 -0700)]
resolved conflicts for merge of
a0eb715a to master
Change-Id: I6341ca672906de3c21800730ac28ba90ecab51ca
Ying Wang [Mon, 11 Oct 2010 23:36:02 +0000 (16:36 -0700)]
Fix typo.
Change-Id: Iabdc6ec1ead4f37294f01ebebc1e71e188455533
Ying Wang [Mon, 11 Oct 2010 23:31:49 +0000 (16:31 -0700)]
Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.
Bug:
3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
android-build SharedAccount [Mon, 11 Oct 2010 22:31:40 +0000 (15:31 -0700)]
HRH11B
Change-Id: I0f435bf16f057679e32c483518317f7341ada649
Bill Napier [Mon, 11 Oct 2010 22:30:09 +0000 (15:30 -0700)]
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.
Bill Napier [Mon, 11 Oct 2010 22:18:04 +0000 (15:18 -0700)]
Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Ying Wang [Mon, 11 Oct 2010 20:44:50 +0000 (13:44 -0700)]
Hook up the dependency.
Now llvm-rs-link is directly called by the build system.
Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
Shih-wei Liao [Mon, 11 Oct 2010 17:36:42 +0000 (10:36 -0700)]
Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc.
Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc
Bill Napier [Mon, 11 Oct 2010 17:21:10 +0000 (10:21 -0700)]
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.
The Android Automerger [Mon, 11 Oct 2010 13:47:57 +0000 (06:47 -0700)]
HRH11
Change-Id: I2f5b4401ce2af6fc8c51a88be9d7554ca85133eb
The Android Automerger [Sun, 10 Oct 2010 23:24:24 +0000 (16:24 -0700)]
HRH10
Change-Id: Id528e641b263c3af3ddfe9d3a7b4cde06887f2e2
The Android Automerger [Sun, 10 Oct 2010 23:22:50 +0000 (16:22 -0700)]
Merge branch 'master' into honeycomb-release
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
Brian Muramatsu [Sun, 10 Oct 2010 19:51:28 +0000 (12:51 -0700)]
am
99185c2a: am
cd7170d7: resolved conflicts for merge of
0f8fcbe2 to gingerbread
Merge commit '
99185c2a462d563855e4bc0c1e5649a21b2e186b'
* commit '
99185c2a462d563855e4bc0c1e5649a21b2e186b':
Support Additional CTS Host Jars
Bill Napier [Sun, 10 Oct 2010 19:06:13 +0000 (12:06 -0700)]
Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
Jean-Baptiste Queru [Sun, 10 Oct 2010 19:00:02 +0000 (12:00 -0700)]
manual merge of
547b902e
Change-Id: Ibfc409f53a82bc7cb5caa6aaf94e18589e06009b
Jean-Baptiste Queru [Sun, 10 Oct 2010 18:57:00 +0000 (11:57 -0700)]
manual merge of
424de177
Change-Id: Iaff23131e9c0ba4de2fc15600f940aa0d23c59fd
Shih-wei Liao [Sun, 10 Oct 2010 16:58:22 +0000 (09:58 -0700)]
Merge "Make naming consistent: llvm-rs-cc and llvm-rs-link."
Ying Wang [Sun, 10 Oct 2010 16:10:22 +0000 (09:10 -0700)]
am
3b008f36: am
83f69eb5: Prepend ccache to CC/CXX if necessary.
Merge commit '
3b008f36956c35f58d510ad3da5090cf21a08349'
* commit '
3b008f36956c35f58d510ad3da5090cf21a08349':
Prepend ccache to CC/CXX if necessary.
Dima Zavin [Sun, 10 Oct 2010 16:10:19 +0000 (09:10 -0700)]
am
21773134: am
4477db78: CHERRY-PICK: propogate module tags for prebuilts
Merge commit '
21773134b44f8d7c7177a60ca94181f2f51ac9c8'
* commit '
21773134b44f8d7c7177a60ca94181f2f51ac9c8':
CHERRY-PICK: propogate module tags for prebuilts
Shih-wei Liao [Fri, 8 Oct 2010 23:57:46 +0000 (16:57 -0700)]
Make naming consistent: llvm-rs-cc and llvm-rs-link.
Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
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
Joe Onorato [Fri, 8 Oct 2010 21:36:43 +0000 (14:36 -0700)]
am
5c41c178: am
700b88e1: Pass device characteristic information through to aapt.
Merge commit '
5c41c17868865d1f2e9e2ff4680b528da61d16af'
* commit '
5c41c17868865d1f2e9e2ff4680b528da61d16af':
Pass device characteristic information through to aapt.
Joe Onorato [Fri, 8 Oct 2010 21:01:50 +0000 (17:01 -0400)]
Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles"
This reverts commit
95e743a6c02c9f9844cab95635b4954ecd82e7ff.
Ying Wang [Fri, 8 Oct 2010 01:57:57 +0000 (18:57 -0700)]
Integrate the slang "-MD" into the build system.
So that the header dependency can be included.
Bug:
2932230
Change-Id: I4d69870049157206ce2ab637ec6d673467db0c64
Ying Wang [Fri, 8 Oct 2010 16:36:57 +0000 (09:36 -0700)]
Merge ""Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function is in a system header file. If so, the function can be prefixed by "rs". Otherwise, "rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking."
The Android Automerger [Fri, 8 Oct 2010 15:48:59 +0000 (08:48 -0700)]
HRH08
Change-Id: I69d3ce734fe6c8285c74362e664a334d683c4d01
The Android Automerger [Fri, 8 Oct 2010 15:47:56 +0000 (08:47 -0700)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Sun, 26 Sep 2010 17:11:29 +0000 (10:11 -0700)]
ip-up-vpn doesn't need to be grandfathered any more
Change-Id: I8fb7f98ec253f95d5eccb2603c4e09db19be2742
Jean-Baptiste Queru [Fri, 8 Oct 2010 14:39:07 +0000 (07:39 -0700)]
Cherry-pick
547b902e
"am
d29f5df3: Merge "Add TTS language files to the full build." into gingerbread"
Change-Id: Iea988350124dacf085244addf34a6f216b58cf77
Jean-Baptiste Queru [Thu, 7 Oct 2010 22:00:12 +0000 (15:00 -0700)]
Cheryr-pick of
424de177
"resolved conflicts for merge of
0f085e5a to gingerbread-plus-aosp"
Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa
Shih-wei Liao [Fri, 8 Oct 2010 14:14:03 +0000 (07:14 -0700)]
"Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function
is in a system header file. If so, the function can be prefixed by "rs". Otherwise,
"rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking.
Change-Id: I8d5982cd6a75d465ffa6f98ca96941ae761117a2
android-build SharedAccount [Thu, 7 Oct 2010 23:12:24 +0000 (16:12 -0700)]
HRH07B
Change-Id: I111f19cf7d10574a8f4c67d32e782197480847b9
Jean-Baptiste Queru [Thu, 7 Oct 2010 23:08:46 +0000 (16:08 -0700)]
Enforce that PRODUCT_ variables aren't modified by module makefiles
This eliminates one of the way a module could insert itself into
a build without going through a product definition file.
Change-Id: I1d537764d73c52ceaec96b64b6b6925e2f6a8d8e
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.
Ying Wang [Thu, 7 Oct 2010 22:24:44 +0000 (15:24 -0700)]
resolved conflicts for merge of
222a835d to master
Change-Id: I82b1f9338eadaed07dc803e56682f4bbb2a97fc3
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.
The Android Automerger [Thu, 7 Oct 2010 13:45:16 +0000 (06:45 -0700)]
HRH07
Change-Id: I3c0e650a0441497862d0389a0d1cdae803643b6f
The Android Automerger [Thu, 7 Oct 2010 13:44:56 +0000 (06:44 -0700)]
Merge branch 'master' into honeycomb-release
Stephen Hines [Wed, 6 Oct 2010 22:52:14 +0000 (15:52 -0700)]
Merge "Remove libclang* from user_tags.mk."
android-build SharedAccount [Wed, 6 Oct 2010 21:38:40 +0000 (14:38 -0700)]
HRH06B
Change-Id: I0ba5c4deaa6e3f90a0f7fbd138e541793619ac3d
Stephen Hines [Wed, 6 Oct 2010 21:14:12 +0000 (14:14 -0700)]
Remove libclang* from user_tags.mk.
Change-Id: I428908bc6142b4c4c2e20bf7dbb86e61ff84734f
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
The Android Automerger [Wed, 6 Oct 2010 15:03:34 +0000 (08:03 -0700)]
HRH06
Change-Id: I25abc8047062b93b479dc6d4706e7629595ed0f8
The Android Automerger [Wed, 6 Oct 2010 15:00:48 +0000 (08:00 -0700)]
Merge branch 'master' into honeycomb-release
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
Romain Guy [Mon, 4 Oct 2010 23:56:11 +0000 (16:56 -0700)]
Add functions to press home, back and menu keys.
Change-Id: I54a28eb75463d5b5f8c9e2f216983aac67be0fa7
The Android Automerger [Tue, 5 Oct 2010 13:44:15 +0000 (06:44 -0700)]
HRH05
Change-Id: I4c1ea1006b7985bc5109c4371c03a2441eb247c1
android-build SharedAccount [Mon, 4 Oct 2010 22:29:37 +0000 (15:29 -0700)]
HRH04C
Change-Id: I11319561b40a65482b286feb1ffbc37f0108fb88
android-build SharedAccount [Mon, 4 Oct 2010 22:12:46 +0000 (15:12 -0700)]
HRH04B
Change-Id: I8b2683b01e2da9d3c908149f5cd14d5f0e67a95c
The Android Automerger [Mon, 4 Oct 2010 14:16:43 +0000 (07:16 -0700)]
HRH04
Change-Id: I4cbd096fed8e9a047443156e10308d5d80559fc7
The Android Automerger [Mon, 4 Oct 2010 14:15:53 +0000 (07:15 -0700)]
Merge branch 'master' into honeycomb-release
Ying Wang [Sun, 3 Oct 2010 03:10:59 +0000 (20:10 -0700)]
am
b7019e21: am
a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.
Merge commit '
b7019e2147173a962febeab0e0693cdec9f80789'
* commit '
b7019e2147173a962febeab0e0693cdec9f80789':
Any intermediate targets between Progaurd and the built_dex should be differently named.
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 [Sat, 2 Oct 2010 00:07:29 +0000 (17:07 -0700)]
am
bf2ed191: am
a83940fa: Move odex related files to product-specific dir.
Merge commit '
bf2ed191fe229b6a83684c19a57e11e7b50c8637'
* commit '
bf2ed191fe229b6a83684c19a57e11e7b50c8637':
Move odex related files to product-specific dir.
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