OSDN Git Service
Colin Cross [Thu, 27 Mar 2014 00:21:55 +0000 (00:21 +0000)]
am
6443630c: am
441e9452: resolved conflicts for merge of
f3e25fea to klp-modular-dev-plus-aosp
* commit '
6443630ccaa5866a9181f869d4f21ddc728d2f7e':
add support for LOCAL_MULTILIB
Colin Cross [Thu, 27 Mar 2014 00:14:05 +0000 (00:14 +0000)]
am
441e9452: resolved conflicts for merge of
f3e25fea to klp-modular-dev-plus-aosp
* commit '
441e9452488ccb98f7b0a7690b86fcdff733e5f0':
add support for LOCAL_MULTILIB
Colin Cross [Thu, 27 Mar 2014 00:06:33 +0000 (17:06 -0700)]
resolved conflicts for merge of
f3e25fea to klp-modular-dev-plus-aosp
Change-Id: I7b002780d8282b54821e8761198bc0af3e7ce71e
Colin Cross [Wed, 26 Mar 2014 23:58:56 +0000 (23:58 +0000)]
am
007faa43: Merge "add support for LOCAL_MULTILIB"
* commit '
007faa43cf380013e2510363b707e46884f1466c':
add support for LOCAL_MULTILIB
Colin Cross [Wed, 26 Mar 2014 22:03:47 +0000 (22:03 +0000)]
Merge "add support for LOCAL_MULTILIB"
Colin Cross [Fri, 21 Mar 2014 19:29:32 +0000 (12:29 -0700)]
add support for LOCAL_MULTILIB
LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and
LOCAL_NO_2ND_ARCH, although both are still supported.
Set LOCAL_MULTILIB := 32 to always build a module 32-bit.
This is the same as specifying LOCAL_32_BIT_ONLY.
Set LOCAL_MULTILIB := first to always build a module for
the first architecture (64-bit on a 64-bit target, 32-bit on a
32-bit target). This is the same as specifying LOCAL_NO_2ND_ARCH.
Set LOCAL_MULTILIB := both to build for both architectures
on a mulitlib (64-bit) target.
If LOCAL_MULTILIB is not set libraries will default to "both",
and executables, packages, and prebuilts will default to building
for the first architecture if supported by the module, otherwise
the second.
Executables that set LOCAL_MULTILIB := both must set either
LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to
differentiate the install locations of the two versions.
Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
Xavier Ducrohet [Wed, 26 Mar 2014 18:29:11 +0000 (11:29 -0700)]
am
86c0cf68: am
c8fea2ae: am
7c629a72: am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
86c0cf68c843ae5a920d40b5c3ec3d6891ebb337':
Add annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 18:23:15 +0000 (18:23 +0000)]
am
c8fea2ae: am
7c629a72: am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
c8fea2ae9859c68e3d48c4e65ada7331daab11f0':
Add annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 18:17:08 +0000 (18:17 +0000)]
am
7c629a72: am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
7c629a728f628278986498060e649727cf5025fa':
Add annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 18:10:46 +0000 (18:10 +0000)]
am
cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '
cc85124393c438986e6639bc90906edf2dc2ca7a':
Add annotation support lib.
Xavier Ducrohet [Wed, 26 Mar 2014 18:06:40 +0000 (18:06 +0000)]
Merge "Add annotation support lib." into klp-ub-dev
Xavier Ducrohet [Wed, 26 Mar 2014 17:50:38 +0000 (10:50 -0700)]
Add annotation support lib.
Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
Geremy Condra [Wed, 26 Mar 2014 01:06:47 +0000 (18:06 -0700)]
am
9a6e8764: Merge "Add the verity key to the verity dependencies."
* commit '
9a6e87648b9dcafce3630dd4510f95fce87791e3':
Add the verity key to the verity dependencies.
Geremy Condra [Wed, 26 Mar 2014 01:03:53 +0000 (01:03 +0000)]
Merge "Add the verity key to the verity dependencies."
Adam Lesinski [Wed, 26 Mar 2014 00:46:12 +0000 (17:46 -0700)]
am
9d9dbaba: Merge "Temporarily use a separate var for including shared resources"
* commit '
9d9dbaba77972e01f3d5e413b402eef177acedc7':
Temporarily use a separate var for including shared resources
Adam Lesinski [Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)]
Merge "Temporarily use a separate var for including shared resources"
Adam Lesinski [Tue, 25 Mar 2014 22:45:34 +0000 (15:45 -0700)]
Temporarily use a separate var for including shared resources
Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
Colin Cross [Tue, 25 Mar 2014 23:54:42 +0000 (16:54 -0700)]
am
c93c10a7: am
8295d6cd: am
ce087413: am
36a67a90: Merge topic \'tests\'
* commit '
c93c10a75bbf509891301fdf25eb1c94e4cf4ccf':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Colin Cross [Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)]
am
8295d6cd: am
ce087413: am
36a67a90: Merge topic \'tests\'
* commit '
8295d6cd62ba73ea66e64204d2d0ea27b4b34889':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Colin Cross [Tue, 25 Mar 2014 23:44:58 +0000 (23:44 +0000)]
am
ce087413: am
36a67a90: Merge topic \'tests\'
* commit '
ce08741397e0468185457f5c7e8aee08272e6752':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Colin Cross [Tue, 25 Mar 2014 23:39:30 +0000 (16:39 -0700)]
am
36a67a90: Merge topic \'tests\'
* commit '
36a67a9040f35fc47c0ea5cafa61910a7e2fcc66':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Colin Cross [Tue, 25 Mar 2014 23:35:32 +0000 (23:35 +0000)]
Merge topic 'tests'
* changes:
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Ying Wang [Tue, 25 Mar 2014 21:54:33 +0000 (14:54 -0700)]
am
dbe23f5d: Set up dependency of resource_export_package
* commit '
dbe23f5d987fac0488ae385478ea2ddf1b8c41ae':
Set up dependency of resource_export_package
Ying Wang [Tue, 25 Mar 2014 21:42:46 +0000 (14:42 -0700)]
Set up dependency of resource_export_package
The rules to build $(resource_export_package) need also the
framework-res's and potentially other shared libraries' package-export.apks.
Change-Id: I9ff10c621917ba7eed2da11a51cd2426845ad9be
Ricardo Cervera [Tue, 25 Mar 2014 21:32:03 +0000 (14:32 -0700)]
am
ab589ea6: am
27de0f14: am
816979cc: am
d9bc3eda: am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
ab589ea6ebfa3f93aaac055806dd37e45c1c2ab6':
docs: Added SDK version to the ADT bundles download path in the CS template.
Tim Murray [Tue, 25 Mar 2014 21:32:01 +0000 (14:32 -0700)]
am
1bbba7d4: am
9c08a73b: am
6440fb0c: am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
1bbba7d404f024e243e5d3fa8f19a53ba61586a5':
Make Clang host builds hermetic on Linux.
Colin Cross [Tue, 25 Mar 2014 21:32:00 +0000 (14:32 -0700)]
am
9b269f22: am
3c1183a6: am
3a943c9e: am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
9b269f228c0a635778d403f4b92559da46c08bd2':
remove libeffects from 64-bit blacklist
Ying Wang [Tue, 25 Mar 2014 21:31:59 +0000 (14:31 -0700)]
am
c63d345b: am
264a5ed3: am
711951ab: am
78a819d6: am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
c63d345b18235a989e473b8641851e5248977a5a':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Ricardo Cervera [Tue, 25 Mar 2014 21:23:54 +0000 (21:23 +0000)]
am
27de0f14: am
816979cc: am
d9bc3eda: am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
27de0f1471daa2f7b35fff41a1fcb04f91dc8c90':
docs: Added SDK version to the ADT bundles download path in the CS template.
Tim Murray [Tue, 25 Mar 2014 21:22:55 +0000 (21:22 +0000)]
am
9c08a73b: am
6440fb0c: am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
9c08a73b242344a18676a2c5b17f5d475abef16f':
Make Clang host builds hermetic on Linux.
Colin Cross [Tue, 25 Mar 2014 21:22:54 +0000 (21:22 +0000)]
am
3c1183a6: am
3a943c9e: am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
3c1183a6634eb37d66e17c0947d9f696cd28e810':
remove libeffects from 64-bit blacklist
Ying Wang [Tue, 25 Mar 2014 21:19:18 +0000 (21:19 +0000)]
am
264a5ed3: am
711951ab: am
78a819d6: am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
264a5ed3654b71ddc3c6dc0a52371624b2fa5204':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Adam Lesinski [Tue, 25 Mar 2014 21:16:28 +0000 (14:16 -0700)]
am
de057c30: Add LOCAL_APK_LIBRARIES to the AAPT -I flag
* commit '
de057c3063b3e67052b82919a4b39dc841ac7ee8':
Add LOCAL_APK_LIBRARIES to the AAPT -I flag
Adam Lesinski [Fri, 14 Mar 2014 01:48:27 +0000 (18:48 -0700)]
Add LOCAL_APK_LIBRARIES to the AAPT -I flag
Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
Colin Cross [Fri, 21 Mar 2014 19:27:37 +0000 (12:27 -0700)]
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
Some executables will need to be built for both 32-bit and 64-bit.
For linker/linker64, debuggerd/debuggerd64, and a few more, they
will be installed in the same path (/system/bin), but with different
filenames. Allow the module to specify LOCAL_MODULE_STEM_32 and
LOCAL_MODULE_STEM_64 to name the two versions.
Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
Colin Cross [Fri, 21 Mar 2014 19:25:44 +0000 (12:25 -0700)]
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Some executables will need to be built for both 32-bit and 64-bit.
For tests, it will be convienient to keep the name of the executable
the same, but install them in a different location. Add
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module
to specify different paths for 32-bit and 64-bit executables.
Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
Ricardo Cervera [Tue, 25 Mar 2014 20:42:24 +0000 (20:42 +0000)]
am
816979cc: am
d9bc3eda: am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
816979cc42a362b1f4485a113b749ae7ba52c882':
docs: Added SDK version to the ADT bundles download path in the CS template.
Ricardo Cervera [Tue, 25 Mar 2014 20:36:42 +0000 (20:36 +0000)]
am
d9bc3eda: am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
d9bc3eda8f8af202071023ffb93aaee96653dc92':
docs: Added SDK version to the ADT bundles download path in the CS template.
Ricardo Cervera [Tue, 25 Mar 2014 20:33:03 +0000 (20:33 +0000)]
am
49b4ef0b: am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
49b4ef0badd51ce3af0511206e20114414a6c427':
docs: Added SDK version to the ADT bundles download path in the CS template.
Ricardo Cervera [Tue, 25 Mar 2014 20:27:48 +0000 (20:27 +0000)]
am
fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '
fd0be925bb6e34768f9f11cf5325d1fcfbf39410':
docs: Added SDK version to the ADT bundles download path in the CS template.
Ricardo Cervera [Tue, 25 Mar 2014 19:33:33 +0000 (12:33 -0700)]
docs: Added SDK version to the ADT bundles download path in the CS template.
Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
Tim Murray [Tue, 25 Mar 2014 19:17:34 +0000 (19:17 +0000)]
am
6440fb0c: am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
6440fb0c844068fd8be5901a2cbb1a0af0a92d15':
Make Clang host builds hermetic on Linux.
Colin Cross [Tue, 25 Mar 2014 19:17:33 +0000 (19:17 +0000)]
am
3a943c9e: am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
3a943c9e571c027c3557bc690204751d4e872995':
remove libeffects from 64-bit blacklist
Tim Murray [Tue, 25 Mar 2014 19:09:35 +0000 (19:09 +0000)]
am
b35094ec: am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
b35094ec709c8de7f3f7d6dbd54655ec99cd9529':
Make Clang host builds hermetic on Linux.
Colin Cross [Tue, 25 Mar 2014 19:09:33 +0000 (19:09 +0000)]
am
0143ee4a: am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
0143ee4a5779620659c7b59e4294359c4a96af78':
remove libeffects from 64-bit blacklist
Tim Murray [Tue, 25 Mar 2014 18:36:38 +0000 (11:36 -0700)]
am
01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '
01aa01dbfac86861c179a7922624f82d752b30ef':
Make Clang host builds hermetic on Linux.
Tim Murray [Tue, 25 Mar 2014 18:33:28 +0000 (18:33 +0000)]
Merge "Make Clang host builds hermetic on Linux."
Colin Cross [Tue, 25 Mar 2014 18:01:14 +0000 (11:01 -0700)]
am
a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '
a3c76c2824c4ce1f097a4c1ae601c0fba8142bc9':
remove libeffects from 64-bit blacklist
Colin Cross [Tue, 25 Mar 2014 17:54:56 +0000 (17:54 +0000)]
Merge "remove libeffects from 64-bit blacklist"
Tim Kilbourn [Tue, 25 Mar 2014 16:30:42 +0000 (09:30 -0700)]
am
a5fdf90b: Merge "Add wifi-service to PRODUCT_PACKAGES."
* commit '
a5fdf90bb790074a55ceb28606d6ec943a271f26':
Add wifi-service to PRODUCT_PACKAGES.
Tim Kilbourn [Tue, 25 Mar 2014 16:25:43 +0000 (16:25 +0000)]
Merge "Add wifi-service to PRODUCT_PACKAGES."
Ying Wang [Tue, 25 Mar 2014 10:10:24 +0000 (10:10 +0000)]
am
711951ab: am
78a819d6: am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
711951abf0c753eba551ba88817321e4cd7b37d9':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Ying Wang [Tue, 25 Mar 2014 10:04:39 +0000 (10:04 +0000)]
am
78a819d6: am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
78a819d600ab750227009fd3dc93f7f2886600c7':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Ying Wang [Tue, 25 Mar 2014 09:56:52 +0000 (09:56 +0000)]
am
266cf4f2: am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
266cf4f2595323170fe02db05835884b4522a0f9':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Tim Kilbourn [Tue, 25 Mar 2014 06:45:23 +0000 (23:45 -0700)]
Add wifi-service to PRODUCT_PACKAGES.
Bug:
13622394
Change-Id: Ifa186db4b804bcb123b26324978c7a1ad986c1e2
Andrew Hsieh [Tue, 25 Mar 2014 03:38:15 +0000 (20:38 -0700)]
am
1477080e: am
cde91b3e: am
0adc6431: am
c550cd45: am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
1477080e348fc445aaf9dbf3163a08bd3b787ae3':
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Andrew Hsieh [Tue, 25 Mar 2014 03:34:29 +0000 (03:34 +0000)]
am
cde91b3e: am
0adc6431: am
c550cd45: am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
cde91b3e6a42e66cb45e75eb69111f37840dffec':
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Andrew Hsieh [Tue, 25 Mar 2014 03:00:07 +0000 (03:00 +0000)]
am
0adc6431: am
c550cd45: am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
0adc643104ffb742a40ae4c38373957362664445':
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Andrew Hsieh [Tue, 25 Mar 2014 02:54:46 +0000 (02:54 +0000)]
am
c550cd45: am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
c550cd45536c7153726c502886bf32797e997dd3':
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Andrew Hsieh [Tue, 25 Mar 2014 02:48:23 +0000 (19:48 -0700)]
am
fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit '
fa97fe67d32860e498acd59eabb7dbc71ca2ff31':
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Andrew Hsieh [Tue, 25 Mar 2014 02:43:57 +0000 (02:43 +0000)]
Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
Tim Murray [Thu, 20 Mar 2014 20:48:35 +0000 (13:48 -0700)]
Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.
bug
13435344
Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
Andrew Hsieh [Sat, 22 Mar 2014 12:36:07 +0000 (20:36 +0800)]
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Previously we have only one set of include/lib paths for
LOCAL_NDK_STL_VARIANT:=gnustl_static regardless of GCC
version, which is wrong because each GCC version
come with its own libstdc++.
Change-Id: I2a01c2120b6948aedce00e2f8d08dfc6932126dd
Colin Cross [Tue, 25 Mar 2014 01:39:30 +0000 (18:39 -0700)]
remove libeffects from 64-bit blacklist
Everything under frameworks/av/media/libeffects compiles fine for
64-bit
Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
Ying Wang [Mon, 24 Mar 2014 21:21:26 +0000 (21:21 +0000)]
am
f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '
f39752e99b4e5083f1e91c46722f87def8143b49':
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Ying Wang [Mon, 24 Mar 2014 19:45:15 +0000 (12:45 -0700)]
am
595f996f: am
7a93f683: am
82a2ae71: am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
595f996f0d3d1aa4598218aade4b589cbbae79fa':
Complete installed shared library dependency
Ying Wang [Mon, 24 Mar 2014 19:36:32 +0000 (19:36 +0000)]
am
7a93f683: am
82a2ae71: am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
7a93f68322eca5ccf32ca9544ba63ec64548e050':
Complete installed shared library dependency
Colin Cross [Sat, 22 Mar 2014 00:46:19 +0000 (17:46 -0700)]
am
cf1f9d2d: fix bad merge conflict resolution
* commit '
cf1f9d2d67411b91c6bc07a12595753471d86b8b':
fix bad merge conflict resolution
Colin Cross [Sat, 22 Mar 2014 00:41:26 +0000 (17:41 -0700)]
fix bad merge conflict resolution
Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
Colin Cross [Sat, 22 Mar 2014 00:34:14 +0000 (17:34 -0700)]
am
f2b60c0f: resolved conflicts for merge of
f8e4d1b7 to master
* commit '
f2b60c0f8052ed6b456e2f63a0e6798d049410ad':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Colin Cross [Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)]
resolved conflicts for merge of
f8e4d1b7 to master
Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94
Ying Wang [Sat, 22 Mar 2014 00:06:57 +0000 (00:06 +0000)]
am
82a2ae71: am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
82a2ae714c42f858985d56da7bc4a3ec1868c155':
Complete installed shared library dependency
Ying Wang [Sat, 22 Mar 2014 00:03:34 +0000 (00:03 +0000)]
am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
Complete installed shared library dependency
Ying Wang [Fri, 21 Mar 2014 23:54:48 +0000 (16:54 -0700)]
am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
8c60a1df4379bcc2fef020878aef8d78233f906d':
Complete installed shared library dependency
Ying Wang [Fri, 21 Mar 2014 23:51:33 +0000 (23:51 +0000)]
Merge "Complete installed shared library dependency"
Ying Wang [Fri, 21 Mar 2014 23:17:04 +0000 (16:17 -0700)]
Complete installed shared library dependency
Previously the installed shared library dependency doesn't include
modules introduced by LOCAL_SHARED_LIBRARIES_<arch>.
This change fix the problem.
It also cleans up use of the shared library variable.
Bug:
13528787
Change-Id: Id8d807cc57f0ec4a71f18b64545d91191efad8fb
Adam Hampson [Fri, 21 Mar 2014 21:36:39 +0000 (14:36 -0700)]
am
e3290e9e: Merge "move libbcc from core_base to core_minimal"
* commit '
e3290e9e46c2df798e08f3d939dd58de8d3d0862':
move libbcc from core_base to core_minimal
Adam Hampson [Fri, 21 Mar 2014 21:31:02 +0000 (21:31 +0000)]
Merge "move libbcc from core_base to core_minimal"
Lajos Molnar [Fri, 21 Mar 2014 21:18:38 +0000 (14:18 -0700)]
am
3d402686: Merge "stagefright: use media_codecs_google*.xml files"
* commit '
3d402686ca4444fea76137208af1fd71bcc8cb21':
stagefright: use media_codecs_google*.xml files
Lajos Molnar [Fri, 21 Mar 2014 21:15:32 +0000 (21:15 +0000)]
Merge "stagefright: use media_codecs_google*.xml files"
Adam Hampson [Fri, 21 Mar 2014 19:40:57 +0000 (12:40 -0700)]
move libbcc from core_base to core_minimal
Bug:
13528787
Change-Id: If8b531f71bf3831e4d3d59e2a2bc04dd72f4a8b1
Signed-off-by: Adam Hampson <ahampson@google.com>
Mark Renouf [Fri, 21 Mar 2014 16:26:32 +0000 (16:26 +0000)]
am
50449c9c: am
37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
* commit '
50449c9cfa558d2901aa95613f4eb8ced7680f25':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Mark Renouf [Fri, 21 Mar 2014 16:22:07 +0000 (16:22 +0000)]
am
37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
* commit '
37f3c5cc1de11f7b316c2d03ed8f6951d4f95372':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Mark Renouf [Fri, 21 Mar 2014 15:50:35 +0000 (11:50 -0400)]
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
Narayan Kamath [Fri, 21 Mar 2014 10:47:42 +0000 (03:47 -0700)]
am
9c2daa97: Merge "Add warning message for java6 builds."
* commit '
9c2daa97e109b2c38789371d6eaa113277cab5ac':
Add warning message for java6 builds.
Narayan Kamath [Fri, 21 Mar 2014 10:43:49 +0000 (10:43 +0000)]
Merge "Add warning message for java6 builds."
Ying Wang [Fri, 21 Mar 2014 00:28:57 +0000 (17:28 -0700)]
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Bug:
11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
Colin Cross [Thu, 20 Mar 2014 22:31:30 +0000 (15:31 -0700)]
am
58596266: am
e07f9225: am
7e998752: am
189a874f: am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
58596266c8d04e943dc3c54667114aa6afca0a96':
remove more projects from 64-bit blacklist
Ying Wang [Thu, 20 Mar 2014 22:31:30 +0000 (15:31 -0700)]
am
81717cc2: am
84fbc7e8: am
996f3826: am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
81717cc251d6890f5bf3fa042bd11d20c7ec556c':
Remove the redundant DISABLE_DEXPREOPT
Ying Wang [Thu, 20 Mar 2014 22:28:02 +0000 (15:28 -0700)]
am
636dc20d: resolved conflicts for merge of
ad495272 to master
* commit '
636dc20d1a2ddb44b345be5ad6e04024788ad90b':
Fix embedded build
Colin Cross [Thu, 20 Mar 2014 22:27:16 +0000 (22:27 +0000)]
am
e07f9225: am
7e998752: am
189a874f: am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
e07f922563e5f3a093187a1e260451c3544bc051':
remove more projects from 64-bit blacklist
Ying Wang [Thu, 20 Mar 2014 22:27:16 +0000 (22:27 +0000)]
am
84fbc7e8: am
996f3826: am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
Remove the redundant DISABLE_DEXPREOPT
Ying Wang [Thu, 20 Mar 2014 22:24:52 +0000 (15:24 -0700)]
resolved conflicts for merge of
ad495272 to master
Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
Colin Cross [Thu, 20 Mar 2014 20:26:54 +0000 (20:26 +0000)]
am
7e998752: am
189a874f: am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
7e998752d73408516104419581d3c70f0d5396c3':
remove more projects from 64-bit blacklist
Ying Wang [Thu, 20 Mar 2014 20:23:29 +0000 (20:23 +0000)]
am
996f3826: am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
996f3826f7005cf207c8565f674ee38df1ada153':
Remove the redundant DISABLE_DEXPREOPT
Colin Cross [Thu, 20 Mar 2014 20:23:05 +0000 (20:23 +0000)]
am
189a874f: am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
189a874f0f3d297107d02222dc3291943a9e82b0':
remove more projects from 64-bit blacklist
Colin Cross [Thu, 20 Mar 2014 20:20:04 +0000 (13:20 -0700)]
am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
8c1bbdb96ee1ea6be4d35236d8af20d5a2d78f6f':
remove more projects from 64-bit blacklist
Ying Wang [Thu, 20 Mar 2014 20:18:38 +0000 (20:18 +0000)]
am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
c5a563447a68c30dd998b7cd6f8f8c30693edc37':
Remove the redundant DISABLE_DEXPREOPT
Colin Cross [Thu, 20 Mar 2014 20:16:53 +0000 (20:16 +0000)]
Merge "remove more projects from 64-bit blacklist"
Ying Wang [Thu, 20 Mar 2014 20:14:12 +0000 (13:14 -0700)]
am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
1c43aaea07fdf2665f1d2305fe16cb29811b32ee':
Remove the redundant DISABLE_DEXPREOPT