OSDN Git Service
Guang Zhu [Mon, 26 May 2014 22:18:02 +0000 (15:18 -0700)]
fix build id
Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
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"
Scott Main [Fri, 23 May 2014 00:42:39 +0000 (00:42 +0000)]
am
e2808370: am
c0387cd0: am
e7d75351: when generating training course pages, use localized descriptions when available
* commit '
e280837053708f85520574c3ccb36be3e367a255':
when generating training course pages, use localized descriptions when available
Scott Main [Fri, 23 May 2014 00:38:23 +0000 (00:38 +0000)]
am
c0387cd0: am
e7d75351: when generating training course pages, use localized descriptions when available
* commit '
c0387cd0f156b9e657e72ca2e24d402e5e0fe57c':
when generating training course pages, use localized descriptions when available
Scott Main [Fri, 23 May 2014 00:33:59 +0000 (00:33 +0000)]
am
e7d75351: when generating training course pages, use localized descriptions when available
* commit '
e7d75351a9918716e75db57cc04baa46a64bf447':
when generating training course pages, use localized descriptions when available
Scott Main [Fri, 23 May 2014 00:26:38 +0000 (17:26 -0700)]
fix regression with horizontal scroll so the sidenav moves
with the rest of the content when the sticky bar is visible
Change-Id: I6c310405c15a8f74719b895f14eb5f4780277845
Scott Main [Thu, 22 May 2014 22:50:56 +0000 (15:50 -0700)]
when generating training course pages, use localized descriptions when available
Change-Id: I1b5078e04b440bf5dff71dc31333bcf1d2202ff9
Colin Cross [Thu, 22 May 2014 19:40:46 +0000 (19:40 +0000)]
am
423242b5: am
828b5183: am
e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '
423242b59ea01dffbb7f79c7c045528f7c351c4b':
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:36:15 +0000 (19:36 +0000)]
am
828b5183: am
e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '
828b518377f69516ea6cbb9ad160d81ced6980d5':
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:31:26 +0000 (19:31 +0000)]
am
e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '
e45c8607b3e2cf7a428a91898aea2752a54389a1':
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:28:01 +0000 (19:28 +0000)]
Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* changes:
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:01:23 +0000 (12:01 -0700)]
set a prebuilt directory name for the 2nd arch
In order to install 32-bit gdbserver on a 64-bit build,
prebuilts/misc/Android.mk needs to know the prebuilt directory name
for the 2nd arch.
Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
Colin Cross [Thu, 22 May 2014 18:59:10 +0000 (11:59 -0700)]
add vendor directories to gdb shared library search path
Change-Id: Ib4ccf3739d6b2f14597605ce06f00e4776f67976
Colin Cross [Thu, 22 May 2014 18:58:40 +0000 (11:58 -0700)]
add 2nd arch gcc to the path
Add the 2nd arch gcc to the path so users can manually run gdb,
addr2line, objdump, etc.
Change-Id: I30ff439bb6548b897d13bfa87151991d5f2948b3
Colin Cross [Thu, 22 May 2014 18:57:43 +0000 (11:57 -0700)]
fix paths when 2nd arch gcc is a different version
arm64 is using gcc 4.9, arm is using gcc 4.8. Fix setpaths() to
get a separate version for the 2nd arch.
Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7
Ying Wang [Thu, 22 May 2014 18:28:06 +0000 (18:28 +0000)]
am
71617605: am
8e2b2d8a: am
b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit '
716176059ab8962c7049f91c83c82b1af9f2632a':
Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Scott Main [Thu, 22 May 2014 18:01:18 +0000 (18:01 +0000)]
am
6433592a: am
0250f80e: am
e8a3139e: am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
6433592aecbfd2aa40a9395866be23ae04c36f63':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Ying Wang [Thu, 22 May 2014 17:47:40 +0000 (17:47 +0000)]
am
8e2b2d8a: am
b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit '
8e2b2d8ad4040d501d4d254cd359cf17ea32bbdd':
Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Ying Wang [Thu, 22 May 2014 17:43:14 +0000 (17:43 +0000)]
am
b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit '
b0143e2fffbd3183175e8c1873d3466598ca9457':
Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Ying Wang [Thu, 22 May 2014 17:38:01 +0000 (17:38 +0000)]
Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
Scott Main [Thu, 22 May 2014 15:01:51 +0000 (15:01 +0000)]
am
0250f80e: am
e8a3139e: am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
0250f80ef0708e9ba71a77cffb29afb2356a5d25':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 14:58:15 +0000 (14:58 +0000)]
am
e8a3139e: am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
e8a3139ebfa103ff2b0ae1dd98abe37186ecbaad':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 14:51:08 +0000 (14:51 +0000)]
am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
b16376f2e600008c0d7233a919edf02a30237a9a':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
The Android Automerger [Thu, 22 May 2014 14:23:17 +0000 (07:23 -0700)]
"AAV52B"
The Android Automerger [Thu, 22 May 2014 14:21:23 +0000 (07:21 -0700)]
merge in master-release history after reset to
87b6b24f863e952bec9be7a5cb8415c195744b18
The Android Automerger [Thu, 22 May 2014 12:52:35 +0000 (05:52 -0700)]
"AAV52"
The Android Automerger [Thu, 22 May 2014 12:49:26 +0000 (05:49 -0700)]
merge in master-release history after reset to
78ae0ad8df1773cda70a5d27b826408d60b25c7b
Lorenzo Colitti [Thu, 22 May 2014 05:57:58 +0000 (05:57 +0000)]
Merge "Build EthernetService."
Scott Main [Thu, 22 May 2014 03:35:47 +0000 (20:35 -0700)]
Change scroll position with javascript instead of CSS.
Makes scroll adjustment work for all types of anchors.
bug:
15129373
Change-Id: I0f934170613e8a60d94f09192e03117b8e9d4852
Ying Wang [Thu, 22 May 2014 02:38:52 +0000 (02:38 +0000)]
am
913e0317: am
a72e6f80: am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
913e031793928981640f51fa2e6480312f044c37':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:34:02 +0000 (02:34 +0000)]
am
a72e6f80: am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
a72e6f80e447acf225822eebdf752c0d8aa2590c':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:29:52 +0000 (02:29 +0000)]
am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
8a3f514d44e2c1d4920126b3edd47f7a7616b732':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:24:59 +0000 (02:24 +0000)]
Merge "Split the rules to build the odex file"
Dmitriy Ivanov [Thu, 22 May 2014 01:31:32 +0000 (01:31 +0000)]
am
4ebdc93f: am
caabca37: am
5caca89c: Merge "Clarify multiarch warnings"
* commit '
4ebdc93f6039b5429c8bbff74373657de6be02b8':
Clarify multiarch warnings
Dmitriy Ivanov [Thu, 22 May 2014 01:28:53 +0000 (01:28 +0000)]
am
caabca37: am
5caca89c: Merge "Clarify multiarch warnings"
* commit '
caabca3786e105abb88728b4d5c4c1436be66ba3':
Clarify multiarch warnings
Dmitriy Ivanov [Thu, 22 May 2014 01:24:48 +0000 (01:24 +0000)]
am
5caca89c: Merge "Clarify multiarch warnings"
* commit '
5caca89c5d66e9999e26905522bf2eed958d0961':
Clarify multiarch warnings
Dmitriy Ivanov [Thu, 22 May 2014 01:22:00 +0000 (01:22 +0000)]
Merge "Clarify multiarch warnings"
Ying Wang [Thu, 22 May 2014 00:52:09 +0000 (00:52 +0000)]
Merge "Don't build tests in PDK build."
Ying Wang [Thu, 22 May 2014 00:45:52 +0000 (17:45 -0700)]
Don't build tests in PDK build.
Change-Id: I8994be0938a3ce87a097669c28b232fd04b77a36
Eric Laurent [Thu, 22 May 2014 00:40:24 +0000 (00:40 +0000)]
Merge "split audio policy library"
The Android Automerger [Wed, 21 May 2014 23:45:01 +0000 (16:45 -0700)]
"AAV51B"
Dmitriy Ivanov [Wed, 21 May 2014 23:38:03 +0000 (16:38 -0700)]
Clarify multiarch warnings
* Show multiarch related warnings only if my_module_multilib is both
Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
Ying Wang [Wed, 21 May 2014 23:13:33 +0000 (16:13 -0700)]
Split the rules to build the odex file
Previously the odex file is byproduct generated by the package.apk rule.
Though we have the odex file depend on the package.apk it doesn't have
its own build recipe. In case package.apk isn't updated but we still
need to update the odex file (such as changed LOCAL_MULTILIB), the odex
file will never be rebuilt.
This change split out the rules to build the odex file and make sure the
build recipe get executed if the odex file needs rebuild.
Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
Mark Salyzyn [Wed, 21 May 2014 21:23:26 +0000 (21:23 +0000)]
Mark Salyzyn [Wed, 21 May 2014 21:16:28 +0000 (21:16 +0000)]
am
1fe58202: am
ea65c191: Merge "libctest: zap"
* commit '
1fe582026940c70f4a7ff8f130372234d07d3611':
libctest: zap
Mark Salyzyn [Wed, 21 May 2014 21:08:24 +0000 (21:08 +0000)]
am
ea65c191: Merge "libctest: zap"
* commit '
ea65c191e7c08233c97c5b854537d2a0d2127733':
libctest: zap
Mark Salyzyn [Wed, 21 May 2014 21:02:10 +0000 (21:02 +0000)]
Merge "libctest: zap"
Ying Wang [Wed, 21 May 2014 20:35:18 +0000 (13:35 -0700)]
Remove .swp file checked in by accident.
Change-Id: I612ff98d53f46abfc6cb51a820ecde2820442940
Mark Salyzyn [Wed, 21 May 2014 20:27:58 +0000 (13:27 -0700)]
libctest: zap
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
Ed Heyl [Wed, 21 May 2014 20:15:06 +0000 (20:15 +0000)]
Merge "check build tests modules in eng and userdebug builds"
Svetoslav Ganov [Wed, 21 May 2014 20:11:47 +0000 (20:11 +0000)]
Merge "Revert "Fix build: Revert "Switching to the final PDF rendering library"""
Svetoslav Ganov [Wed, 21 May 2014 19:40:31 +0000 (19:40 +0000)]
Revert "Fix build: Revert "Switching to the final PDF rendering library""
This reverts commit
fa4f6471c48d2255a08432b20b0b16f3ae712d4c.
Change-Id: I7541ddad1302ca0f39aec62e3c4ca399046e56a6
Lorenzo Colitti [Wed, 21 May 2014 02:59:10 +0000 (19:59 -0700)]
Build EthernetService.
This is included in the PRODUCT_BOOT_JARS because it needs to be
loaded by system_server via SystemServiceManager.startService,
which only looks at the boot classpath.
This is compiled on all devices as opposed to only devices with
a physical Ethernet port because we also support Ethernet over
USB.
Change-Id: I55bc422e2a7b700eea4b7513f96079502be36882
Ed Heyl [Wed, 21 May 2014 19:23:35 +0000 (19:23 +0000)]
Merge "Fix build: Revert "Switching to the final PDF rendering library""
Ed Heyl [Wed, 21 May 2014 19:21:54 +0000 (19:21 +0000)]
Fix build: Revert "Switching to the final PDF rendering library"
This reverts commit
7a32ace471423666c9366f9beeefec9b9c5251eb.
Change-Id: Icf5b4e16e12a0ca6f7fb662472801f90840a743f
Sreeram Ramachandran [Wed, 21 May 2014 18:13:46 +0000 (11:13 -0700)]
Put back the netd_client library internally.
Change-Id: I0682377466d6ecb2c56f582369a65fd37ab8063a
Sreeram Ramachandran [Wed, 21 May 2014 18:10:22 +0000 (18:10 +0000)]
am
baf9741d: am
feb371ad: am
90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."
* commit '
baf9741d55b12c60fcf4e19d29b4a3ce10f7bfc3':
Remove netd_client. It has moved to the internal tree.
Ying Wang [Wed, 21 May 2014 18:00:57 +0000 (11:00 -0700)]
check build tests modules in eng and userdebug builds
To catch more build breakage, check build tests modules in eng and
userdebug builds.
Change-Id: Ic3b34dcd199e50e555c33eb686a501acef59a8c2
Svetoslav [Wed, 21 May 2014 17:40:00 +0000 (10:40 -0700)]
Switching to the final PDF rendering library
Change-Id: I27fdb9b937fa08986f52084d3647d4d23d2db6a4
Sreeram Ramachandran [Wed, 21 May 2014 17:04:16 +0000 (17:04 +0000)]
am
feb371ad: am
90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."
* commit '
feb371ad6b437aac82b46c74956bff1f83df3744':
Remove netd_client. It has moved to the internal tree.
Sreeram Ramachandran [Wed, 21 May 2014 17:01:40 +0000 (17:01 +0000)]
am
90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."
* commit '
90a0edbc0b6dfee222ff630973308c737202a6b7':
Remove netd_client. It has moved to the internal tree.
Sreeram Ramachandran [Wed, 21 May 2014 16:59:25 +0000 (16:59 +0000)]
Merge "Remove netd_client. It has moved to the internal tree."
Sreeram Ramachandran [Wed, 21 May 2014 16:55:44 +0000 (09:55 -0700)]
Remove netd_client. It has moved to the internal tree.
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
Eric Laurent [Wed, 21 May 2014 15:04:50 +0000 (08:04 -0700)]
split audio policy library
Split the audio policy library into the service part
and the policy part. This will allow OEMs to customize
the policy part.
Change-Id: I3b33d7e0cfd70595b806e3267af8a6a7b5571ec2
The Android Automerger [Wed, 21 May 2014 12:52:26 +0000 (05:52 -0700)]
"AAV51"
The Android Automerger [Wed, 21 May 2014 12:49:24 +0000 (05:49 -0700)]
merge in master-release history after reset to
f218d8824388174af16b9cb08b1e6da34fcde750
Griff Hazen [Wed, 21 May 2014 03:47:58 +0000 (03:47 +0000)]
am
0413efd2: (-s ours) resolved conflicts for merge of
3bb81eb0 to klp-modular-dev-plus-aosp
* commit '
0413efd261c9e6103ec65ff60af3ef22dfc80d19':
Set API version for KKWT. DO NOT MERGE
Griff Hazen [Wed, 21 May 2014 03:05:08 +0000 (20:05 -0700)]
resolved conflicts for merge of
3bb81eb0 to klp-modular-dev-plus-aosp
Justin Koh [Wed, 21 May 2014 02:42:32 +0000 (02:42 +0000)]
Merge "Set API version for KKWT. DO NOT MERGE" into klp-modular-dev
Ying Wang [Wed, 21 May 2014 01:12:15 +0000 (01:12 +0000)]
am
2f4c0a86: am
8a724260: am
4e151105: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
2f4c0a8617e75a8aa28ba898c9213422aa7e93f0':
Support to extract JNI libs from prebuilt APK
Ying Wang [Wed, 21 May 2014 01:10:15 +0000 (01:10 +0000)]
am
8a724260: am
4e151105: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
8a724260f2a3900808e0e733b893a37c119fe3f1':
Support to extract JNI libs from prebuilt APK
Ying Wang [Wed, 21 May 2014 01:06:03 +0000 (01:06 +0000)]
am
4e151105: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
4e151105a02ba09acb277c6a084252d01c561a5f':
Support to extract JNI libs from prebuilt APK
Ying Wang [Tue, 20 May 2014 21:43:51 +0000 (14:43 -0700)]
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.
Bug:
13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
Ying Wang [Wed, 21 May 2014 01:02:57 +0000 (01:02 +0000)]
Merge "Support to extract JNI libs from prebuilt APK"
Ying Wang [Sat, 19 Apr 2014 03:13:41 +0000 (20:13 -0700)]
Support to extract JNI libs from prebuilt APK
Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted
from the prebuilt apk, or prebuilts as source, to the app specific lib path.
LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files:
- Files like @path/to/libfoo.so (path inside the apk) are JNI libs
extracted from the prebuilt apk. In this case, all embedded JNI libs
inside the prebuilt apk are stripped.
- Files like path/to/libfoo.so (path relative to LOCAL_PATH) are
prebuilts in the source tree.
Those prebuilt JNI libs are not defined as modules in the build system,
so this works around possible module name conflict.
Bug:
13170859
Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
Elliott Hughes [Wed, 21 May 2014 00:01:45 +0000 (00:01 +0000)]
am
d72b3164: am
e972f9ff: am
0dbcff95: Merge "The generic_arm64 system image is full."
* commit '
d72b3164bdb731dd9871b221fe8db099a1f94514':
The generic_arm64 system image is full.
Christopher Ferris [Wed, 21 May 2014 00:01:44 +0000 (00:01 +0000)]
am
bcbf9ae4: am
965f3919: am
a2cd924b: Merge "Fix extra/missing : in path setup."
* commit '
bcbf9ae4de41b2cd98ef96f61066496030ef31a1':
Fix extra/missing : in path setup.
Elliott Hughes [Tue, 20 May 2014 23:40:01 +0000 (23:40 +0000)]
am
e972f9ff: am
0dbcff95: Merge "The generic_arm64 system image is full."
* commit '
e972f9ffc00c09d3071c899c68c5de31dd4d122a':
The generic_arm64 system image is full.
Christopher Ferris [Tue, 20 May 2014 23:40:00 +0000 (23:40 +0000)]
am
965f3919: am
a2cd924b: Merge "Fix extra/missing : in path setup."
* commit '
965f39190cb50d97b98d47ba8ca205661cfa2c3d':
Fix extra/missing : in path setup.
Elliott Hughes [Tue, 20 May 2014 23:36:30 +0000 (23:36 +0000)]
am
0dbcff95: Merge "The generic_arm64 system image is full."
* commit '
0dbcff9599be1f999df467b7d17b4f2785a8452a':
The generic_arm64 system image is full.
Christopher Ferris [Tue, 20 May 2014 23:36:28 +0000 (23:36 +0000)]
am
a2cd924b: Merge "Fix extra/missing : in path setup."
* commit '
a2cd924bef556cb6ceccca1098cae338d37200a6':
Fix extra/missing : in path setup.
Ying Wang [Tue, 20 May 2014 23:21:36 +0000 (23:21 +0000)]
Merge "Fix typo."
Ying Wang [Tue, 20 May 2014 23:20:44 +0000 (16:20 -0700)]
Fix typo.
Change-Id: I027b91d3a89de12a9c9f95406274726574bc7f7a
Yuncheol Heo [Tue, 20 May 2014 22:50:05 +0000 (22:50 +0000)]
Merge "Fix the path for findbugs."
The Android Automerger [Tue, 20 May 2014 22:33:49 +0000 (15:33 -0700)]
AAV50C
The Android Automerger [Tue, 20 May 2014 22:00:03 +0000 (15:00 -0700)]
"AAV50B"
Elliott Hughes [Tue, 20 May 2014 21:48:10 +0000 (21:48 +0000)]
Merge "The generic_arm64 system image is full."
Elliott Hughes [Tue, 20 May 2014 21:37:51 +0000 (14:37 -0700)]
The generic_arm64 system image is full.
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
Christopher Ferris [Tue, 20 May 2014 21:18:50 +0000 (21:18 +0000)]
Merge "Fix extra/missing : in path setup."
Christopher Ferris [Tue, 20 May 2014 20:56:00 +0000 (13:56 -0700)]
Fix extra/missing : in path setup.
Change-Id: I4d95efc781c58af704012922d95841e009bf6286