OSDN Git Service
Dave Allison [Thu, 29 May 2014 21:09:56 +0000 (21:09 +0000)]
am
faa2d249: am
f4115cdf: am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
faa2d24991682e31804f8cfcdc16a4f09fb4dbad':
Add libsigchain to the embedded.mk makefile
Brian Carlstrom [Thu, 29 May 2014 21:09:55 +0000 (21:09 +0000)]
am
c93c0308: am
ab6f84e3: am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
c93c03081bd86bc003bc0eb0655d82e20503cd17':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 21:09:54 +0000 (21:09 +0000)]
am
8fe9c76d: resolved conflicts for merge of
2267c22b to klp-modular-dev-plus-aosp
* commit '
8fe9c76d9acbf5a95e8e1d8a151658a8c9bac9f4':
Remove dependencies on runtime_libdvm and libdvm.so in general
Dave Allison [Thu, 29 May 2014 21:06:26 +0000 (21:06 +0000)]
am
f4115cdf: am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
f4115cdfac6bfde8e3d7cab1e7782d078d764209':
Add libsigchain to the embedded.mk makefile
Brian Carlstrom [Thu, 29 May 2014 21:06:19 +0000 (21:06 +0000)]
am
ab6f84e3: am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
ab6f84e3d1886237e9516ebe4660d8e1042a6a75':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 21:01:24 +0000 (14:01 -0700)]
resolved conflicts for merge of
2267c22b to klp-modular-dev-plus-aosp
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
Vineeta Srivastava [Thu, 29 May 2014 20:53:43 +0000 (20:53 +0000)]
Merge "add moto to vendor owner whitelist"
Dave Allison [Thu, 29 May 2014 19:57:50 +0000 (19:57 +0000)]
am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
Dave Allison [Thu, 29 May 2014 19:51:50 +0000 (19:51 +0000)]
Merge "Add libsigchain to the embedded.mk makefile"
Brian Carlstrom [Thu, 29 May 2014 19:40:02 +0000 (19:40 +0000)]
am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 19:39:49 +0000 (19:39 +0000)]
am
f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
f2a2406b8c01e71603feaa5eaccd75d26ea76804':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:36:37 +0000 (19:36 +0000)]
Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
Brian Carlstrom [Thu, 29 May 2014 19:36:35 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Brian Carlstrom [Thu, 29 May 2014 05:13:07 +0000 (22:13 -0700)]
Only enable WITH_DEXPREOPT by default for libdvm.so
Bug:
14298175
(cherry picked from commit
9f8e214a919097284a88cb19a1b85ceafc202a67)
Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
bf8a374a92e327efed95892fe67e6917a89c6c2b)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
Brian Carlstrom [Thu, 29 May 2014 16:37:20 +0000 (16:37 +0000)]
am
9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so
* commit '
9f8e214a919097284a88cb19a1b85ceafc202a67':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 16:37:19 +0000 (16:37 +0000)]
am
bf8a374a: Remove dependencies on runtime_libdvm and libdvm.so in general
* commit '
bf8a374a92e327efed95892fe67e6917a89c6c2b':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 05:13:07 +0000 (22:13 -0700)]
Only enable WITH_DEXPREOPT by default for libdvm.so
Bug:
14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
Ying Wang [Thu, 29 May 2014 00:42:11 +0000 (00:42 +0000)]
am
1ef0a635: Fix pattern rules for for libdvm.
* commit '
1ef0a635f370acf22c8a23ec608d8d03508274ba':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 23:45:29 +0000 (23:45 +0000)]
am
834ec0ea: am
d3ddfdf8: am
b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '
834ec0ead591cf64a5f660af0210e95728e08c4f':
Add a dummy build recipe for generated RS cpp files.
Ying Wang [Wed, 28 May 2014 23:41:42 +0000 (23:41 +0000)]
am
d3ddfdf8: am
b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '
d3ddfdf847eaf44219943cda441273be85b01635':
Add a dummy build recipe for generated RS cpp files.
Ying Wang [Wed, 28 May 2014 23:38:46 +0000 (23:38 +0000)]
am
b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '
b3bed5952b44e69dc9e1988beb4092303084ef61':
Add a dummy build recipe for generated RS cpp files.
Ying Wang [Wed, 28 May 2014 23:33:35 +0000 (23:33 +0000)]
Merge "Add a dummy build recipe for generated RS cpp files."
Ying Wang [Wed, 28 May 2014 23:33:07 +0000 (23:33 +0000)]
am
f0c41848: am
d40776aa: am
65afd710: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
f0c4184852f919d2f2128a1c4fd2dc4405b37c1b':
Add a dummy build recipe for the proto generated header files
Ying Wang [Wed, 28 May 2014 23:31:02 +0000 (23:31 +0000)]
am
d40776aa: am
65afd710: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
d40776aa8800d62a182eeed82c3ac1cef90e69ab':
Add a dummy build recipe for the proto generated header files
Ying Wang [Wed, 28 May 2014 23:28:58 +0000 (23:28 +0000)]
am
65afd710: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
65afd710a592390671beb5da15a87b127a5f2125':
Add a dummy build recipe for the proto generated header files
Ying Wang [Wed, 28 May 2014 23:26:01 +0000 (23:26 +0000)]
Merge "Add a dummy build recipe for the proto generated header files"
Brian Carlstrom [Wed, 28 May 2014 23:18:51 +0000 (23:18 +0000)]
am
9843e863: am
ed97938c: am
7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
9843e863953a2e1b7f38f0beab294d2c9d12a868':
Move to dalvik.vm.lib.2 to force default to libart
Ying Wang [Wed, 28 May 2014 23:17:09 +0000 (16:17 -0700)]
Add a dummy build recipe for generated RS cpp files.
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.
Bug:
15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
Ying Wang [Fri, 14 Feb 2014 02:04:00 +0000 (18:04 -0800)]
Add a dummy build recipe for the proto generated header files
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.
Bug:
13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
Brian Carlstrom [Wed, 28 May 2014 23:13:28 +0000 (23:13 +0000)]
am
ed97938c: am
7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 23:02:45 +0000 (16:02 -0700)]
resolved conflicts for merge of
7e127ebe to master
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
Brian Carlstrom [Wed, 28 May 2014 22:31:44 +0000 (22:31 +0000)]
am
7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:35 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Ying Wang [Wed, 28 May 2014 20:34:59 +0000 (13:34 -0700)]
Fix pattern rules for $(installed_odex) for libdvm.
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.
Bug:
15311527
(cherry picked from commit
994c226b91d0b9695cfde8dabb8f243e9f53be64)
Change-Id: I5469ef1994f2ba91a9c25126349156752fc35b4b
Brian Carlstrom [Wed, 28 May 2014 21:31:46 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
7e127ebe0bf8753fcbeeac6140916d512322e308)
Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
Ying Wang [Wed, 28 May 2014 21:36:11 +0000 (21:36 +0000)]
am
dcf90646: am
8898f2e2: am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
dcf90646b0122b09755014832a67b7c44bc2e1ac':
Fix pattern rules for $(installed_odex) for libdvm.
Brian Carlstrom [Wed, 28 May 2014 21:31:46 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
Ying Wang [Wed, 28 May 2014 21:31:19 +0000 (21:31 +0000)]
am
8898f2e2: am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
8898f2e261d1bb2b389971803a1f4a23639ade9e':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 21:28:42 +0000 (21:28 +0000)]
am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
f4999d3b8a0d09e790767176c543df1c2ad53c5a':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 21:25:34 +0000 (21:25 +0000)]
Merge "Fix pattern rules for $(installed_odex) for libdvm."
Ying Wang [Wed, 28 May 2014 20:34:59 +0000 (13:34 -0700)]
Fix pattern rules for $(installed_odex) for libdvm.
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.
Bug:
15311527
Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
Ed Heyl [Wed, 28 May 2014 19:32:45 +0000 (19:32 +0000)]
Revert, strange side affects to other (like lunch) commands.
This reverts commit
6acfdd62de0454c98b27db51cf0e6af7f2250d2f.
Change-Id: Ic0a84700912570ddec70d152767a9d40f8fa71b0
Ed Heyl [Wed, 28 May 2014 18:14:35 +0000 (11:14 -0700)]
wrap make and print success/failure message, more later
Change-Id: I7debc62babcd855a2d6355dddd00f4531050151c
Ying Wang [Wed, 28 May 2014 18:05:47 +0000 (11:05 -0700)]
resolved conflicts for merge of
536d4a76 to master
Change-Id: Ib655d08e5c9272aef1fd1e130b5fb2b63148a55e
Elliott Hughes [Wed, 28 May 2014 18:01:54 +0000 (18:01 +0000)]
am
55b2c360: am
ad319779: am
4afe808c: Merge "Fix all the system image sizes."
* commit '
55b2c3600fcbdc6bd0dbf3319eb219188553429c':
Fix all the system image sizes.
Rick Zhang [Wed, 28 May 2014 16:44:31 +0000 (09:44 -0700)]
add moto to vendor owner whitelist
Change-Id: I63760a380a17fe096c2aff1133bba336ac8bd7f1
Ying Wang [Wed, 28 May 2014 16:18:56 +0000 (16:18 +0000)]
am
7e4c73d5: am
aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '
7e4c73d5885402f5c301309094ce3dbceef0ecd3':
Support LOCAL_CLANG with arch/bit suffix.
Ying Wang [Wed, 28 May 2014 16:14:54 +0000 (16:14 +0000)]
am
aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '
aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
Support LOCAL_CLANG with arch/bit suffix.
Ying Wang [Wed, 28 May 2014 16:12:39 +0000 (16:12 +0000)]
Merge "Support LOCAL_CLANG with arch/bit suffix."
Vineeta Srivastava [Wed, 28 May 2014 15:40:19 +0000 (15:40 +0000)]
Merge "Add 'qti' to vendor whitelist"
Elliott Hughes [Wed, 28 May 2014 04:07:39 +0000 (04:07 +0000)]
am
ad319779: am
4afe808c: Merge "Fix all the system image sizes."
* commit '
ad319779ff31f9c03b05b65ae84bc2b81ba0d9ee':
Fix all the system image sizes.
Elliott Hughes [Wed, 28 May 2014 04:04:36 +0000 (04:04 +0000)]
am
4afe808c: Merge "Fix all the system image sizes."
* commit '
4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
Fix all the system image sizes.
Elliott Hughes [Wed, 28 May 2014 04:01:52 +0000 (04:01 +0000)]
Merge "Fix all the system image sizes."
Elliott Hughes [Tue, 27 May 2014 23:47:44 +0000 (16:47 -0700)]
Fix all the system image sizes.
x86 just bit me. I did manage to build mips today, but I assume it
can't be long before we hit the limit there too if every other target
has hit it already.
Change-Id: I28dfe3b4f9565cb79e0bf6b0ffc55a9d6e64a9b0
Ajay Dudani [Tue, 27 May 2014 21:29:46 +0000 (14:29 -0700)]
Add 'qti' to vendor whitelist
Bug:
15287127
Change-Id: I4440fb0428a345edb782888fe278b8fd6d809b5d
Jeff Brown [Tue, 27 May 2014 21:46:57 +0000 (21:46 +0000)]
Merge "Support more precise package exclusion from JAR files."
Ying Wang [Tue, 27 May 2014 20:03:36 +0000 (13:03 -0700)]
Support LOCAL_CLANG with arch/bit suffix.
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.
Bug:
15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
Dan Albert [Tue, 27 May 2014 19:50:55 +0000 (19:50 +0000)]
am
cd74f307: am
a5b0b130: am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
cd74f3073c4d0fa7d566705b0eb38c635c1c9344':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:47:08 +0000 (19:47 +0000)]
am
a5b0b130: am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
a5b0b1303d38fb1cd31575383c647eb8b1db5e36':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:44:19 +0000 (19:44 +0000)]
am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
3805f619156163eab8ad92fd51b4a431be1287bd':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:41:46 +0000 (19:41 +0000)]
Merge "Revert "Fix for duplicate names in whole static libs""
Dan Albert [Tue, 27 May 2014 19:30:36 +0000 (19:30 +0000)]
Revert "Fix for duplicate names in whole static libs"
This reverts commit
0e5ce8be34446278a3404ea2a4afc01f20f86c5a.
Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
Dan Albert [Tue, 27 May 2014 18:33:19 +0000 (18:33 +0000)]
am
e6918b55: am
212772f6: am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
e6918b559d911fd58dc03b60e4b866b23c935f72':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:30:08 +0000 (18:30 +0000)]
am
212772f6: am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
212772f6322ef41a1b18023d15eb2b69efa19be8':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:26:38 +0000 (18:26 +0000)]
am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
31101623b3e621436f6b46f49242ed4642d86164':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:23:26 +0000 (18:23 +0000)]
Merge "Fix for duplicate names in whole static libs"
Ying Wang [Tue, 27 May 2014 17:59:11 +0000 (17:59 +0000)]
am
65475feb: am
29267309: am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
65475feb5999068096b287faac9199d1c8e18340':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:55:35 +0000 (17:55 +0000)]
am
29267309: am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
292673094c59bf235a8ba188c2736199f6082105':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:52:10 +0000 (17:52 +0000)]
am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
294301bb34b62d51305d70780ac031a905fa9efe':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:49:12 +0000 (17:49 +0000)]
Merge "Exclude libstdc++ and libgcc if libc++ is requested."
Guang Zhu [Tue, 27 May 2014 17:23:53 +0000 (17:23 +0000)]
Guang Zhu [Mon, 26 May 2014 22:18:02 +0000 (15:18 -0700)]
fix build id
Bug:
15264432
Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
(cherry picked from commit
44e1b0bd8a4085f7fb5ac124ad4d55228aa4f98d)
Guang Zhu [Tue, 27 May 2014 17:18:48 +0000 (17:18 +0000)]
Merge "fix build id"
Narayan Kamath [Tue, 27 May 2014 11:29:41 +0000 (12:29 +0100)]
resolved conflicts for merge of
38c3c930 to master
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
Narayan Kamath [Tue, 27 May 2014 11:23:39 +0000 (11:23 +0000)]
am
06db7324: resolved conflicts for merge of
0f99bb3d to klp-modular-dev-plus-aosp
* commit '
06db73241a12a6b5f352647e966d254ae6443f68':
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
Narayan Kamath [Tue, 27 May 2014 11:23:34 +0000 (11:23 +0000)]
am
6c2ae327: am
8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '
6c2ae327665396958ba6f08dc72bc30b3455d046':
Switch x86_64 emulator to 64 bit primary.
Narayan Kamath [Tue, 27 May 2014 11:21:22 +0000 (12:21 +0100)]
resolved conflicts for merge of
0f99bb3d to klp-modular-dev-plus-aosp
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
Narayan Kamath [Tue, 27 May 2014 11:15:57 +0000 (11:15 +0000)]
am
8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '
8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
Switch x86_64 emulator to 64 bit primary.
Narayan Kamath [Tue, 27 May 2014 11:15:56 +0000 (11:15 +0000)]
am
7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
* commit '
7b31bd3e8f25b9b232204d4b64399d78d6e41163':
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
Narayan Kamath [Tue, 27 May 2014 11:13:42 +0000 (11:13 +0000)]
Merge "Switch x86_64 emulator to 64 bit primary."
Narayan Kamath [Tue, 27 May 2014 11:12:33 +0000 (11:12 +0000)]
Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
Narayan Kamath [Wed, 21 May 2014 11:44:37 +0000 (12:44 +0100)]
Switch x86_64 emulator to 64 bit primary.
Also siezes the opportunity to remove the hardcoded
TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk.
This avoids the need for further hacks but needs supporting
changes to a few apps to force them to 32 bit.
Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
Narayan Kamath [Tue, 6 May 2014 14:14:09 +0000 (15:14 +0100)]
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
(cherry picked from commit
7b9347a7f9d870e149ef38438ad547abe2709ee2)
Change-Id: If459eab32c6e7831596224ad3503baefbf028133
Guang Zhu [Mon, 26 May 2014 22:18:02 +0000 (15:18 -0700)]
fix build id
Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
Jeff Brown [Sat, 24 May 2014 01:41:19 +0000 (18:41 -0700)]
Support more precise package exclusion from JAR files.
Allow LOCAL_JAR_PACKAGES to work on subpackages. Previously it
only worked on top-level packages due to a bug in how the directories
were recursively deleted.
Add LOCAL_JAR_EXCLUDE_PACKAGES to allow specific subpackages to
be excluded. This rule applies after LOCAL_JAR_PACKAGES has
selected which packages to include. It may also be used independently.
Change-Id: Ibd0e495be1a20c84b59c9da132e92100ef3f8705
Dan Albert [Fri, 23 May 2014 17:41:29 +0000 (10:41 -0700)]
Fix for duplicate names in whole static libs
_extract-and-include-single-(host|target)-whole-static-lib was written such that
only the first file of a given name would be extracted and included into the new
library. This patch iterates over each identically named archive member,
extracts them individually, and adds them to the new archive.
Bug:
15110069
Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
Ying Wang [Fri, 23 May 2014 23:42:37 +0000 (16:42 -0700)]
Exclude libstdc++ and libgcc if libc++ is requested.
Bug:
15174002
Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
Scott Main [Fri, 23 May 2014 22:05:38 +0000 (22:05 +0000)]
am
bcdbb68a: am
ed02b7fb: am
8b2be3d8: am
f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '
bcdbb68a9b0466136af0b4c9d5b46d4b6343cc2d':
fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
Scott Main [Fri, 23 May 2014 21:57:59 +0000 (21:57 +0000)]
am
ed02b7fb: am
8b2be3d8: am
f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '
ed02b7fb1219de39adbec8ad432684822e37e320':
fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
Scott Main [Fri, 23 May 2014 21:52:47 +0000 (21:52 +0000)]
am
8b2be3d8: am
f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '
8b2be3d81d780e0549907b58ebf860e0cbbabd07':
fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
Scott Main [Fri, 23 May 2014 21:49:16 +0000 (21:49 +0000)]
am
f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '
f525781ea843cd6518f45c0146074e335b942a2a':
fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
Ying Wang [Fri, 23 May 2014 19:43:57 +0000 (19:43 +0000)]
am
2bf10a72: am
cdcb6926: am
6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '
2bf10a72f87a8e97923286aa331f7db81e2361ca':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
Scott Main [Fri, 23 May 2014 19:34:28 +0000 (19:34 +0000)]
am
8758e0cd: am
e2808370: am
c0387cd0: am
e7d75351: when generating training course pages, use localized descriptions when available
* commit '
8758e0cdf0f9d41c420ef64c8362788707fd378c':
when generating training course pages, use localized descriptions when available
The Android Automerger [Fri, 23 May 2014 18:22:17 +0000 (18:22 +0000)]
The Android Automerger [Fri, 23 May 2014 18:22:16 +0000 (18:22 +0000)]
am
c64d2a5b: merge in master-release history after reset to
87b6b24f863e952bec9be7a5cb8415c195744b18
* commit '
c64d2a5b7779be797ce4bdaa8ba5eb3e3165fb33': (312 commits)
"AAV52"
"AAV51B"
"AAV51"
AAV50C
"AAV50B"
"AAV50"
"AAV49B"
Fix salt for verity tree generation.
"AAV49"
"AAV48"
"AAV47"
AAV45F
"AAV45E"
"AAV45D"
"AAV45C"
"AAV45B"
"AAV45"
"AAV44C"
AAV44B
"AAV44"
...
Ying Wang [Fri, 23 May 2014 17:48:27 +0000 (17:48 +0000)]
am
cdcb6926: am
6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '
cdcb6926d40b502ed89a285cdd4d99beb4cf8009':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
Ying Wang [Fri, 23 May 2014 17:44:31 +0000 (17:44 +0000)]
am
6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '
6cb69bd4f20ac3ae3a7d5b5cc323c4480cf8ef75':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
Ying Wang [Fri, 23 May 2014 17:39:40 +0000 (17:39 +0000)]
Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"