The Android Automerger
618f9d8bee
"AAV52"
2014-05-22 05:52:35 -07:00
The Android Automerger
cb22ea85cc
merge in master-release history after reset to 78ae0ad8df
2014-05-22 05:49:26 -07:00
Ying Wang
78ae0ad8df
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
2014-05-22 02:38:52 +00:00
Ying Wang
913e031793
am a72e6f80
: am 8a3f514d
: Merge "Split the rules to build the odex file"
...
* commit 'a72e6f80e447acf225822eebdf752c0d8aa2590c':
Split the rules to build the odex file
2014-05-22 02:34:02 +00:00
Ying Wang
a72e6f80e4
am 8a3f514d
: Merge "Split the rules to build the odex file"
...
* commit '8a3f514d44e2c1d4920126b3edd47f7a7616b732':
Split the rules to build the odex file
2014-05-22 02:29:52 +00:00
Ying Wang
8a3f514d44
Merge "Split the rules to build the odex file"
2014-05-22 02:24:59 +00:00
Dmitriy Ivanov
70917bcebc
am 4ebdc93f
: am caabca37
: am 5caca89c
: Merge "Clarify multiarch warnings"
...
* commit '4ebdc93f6039b5429c8bbff74373657de6be02b8':
Clarify multiarch warnings
2014-05-22 01:31:32 +00:00
Dmitriy Ivanov
4ebdc93f60
am caabca37
: am 5caca89c
: Merge "Clarify multiarch warnings"
...
* commit 'caabca3786e105abb88728b4d5c4c1436be66ba3':
Clarify multiarch warnings
2014-05-22 01:28:53 +00:00
Dmitriy Ivanov
caabca3786
am 5caca89c
: Merge "Clarify multiarch warnings"
...
* commit '5caca89c5d66e9999e26905522bf2eed958d0961':
Clarify multiarch warnings
2014-05-22 01:24:48 +00:00
Dmitriy Ivanov
5caca89c5d
Merge "Clarify multiarch warnings"
2014-05-22 01:22:00 +00:00
Ying Wang
68e58d86f6
Merge "Don't build tests in PDK build."
2014-05-22 00:52:09 +00:00
Ying Wang
9734252ccf
Don't build tests in PDK build.
...
Change-Id: I8994be0938a3ce87a097669c28b232fd04b77a36
2014-05-21 17:45:52 -07:00
Eric Laurent
9b71d1de32
Merge "split audio policy library"
2014-05-22 00:40:24 +00:00
The Android Automerger
16bc13a693
"AAV51B"
2014-05-21 16:45:01 -07:00
Dmitriy Ivanov
38bba065e0
Clarify multiarch warnings
...
* Show multiarch related warnings only if my_module_multilib is both
Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
2014-05-21 16:40:35 -07:00
Ying Wang
36142f64ae
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
2014-05-21 16:24:59 -07:00
Mark Salyzyn
5eb187beaf
am 1309152e
: am 1fe58202
: am ea65c191
: Merge "libctest: zap"
...
* commit '1309152ec189e670d1c246bbabe1f33942e401b1':
libctest: zap
2014-05-21 21:23:26 +00:00
Mark Salyzyn
1309152ec1
am 1fe58202
: am ea65c191
: Merge "libctest: zap"
...
* commit '1fe582026940c70f4a7ff8f130372234d07d3611':
libctest: zap
2014-05-21 21:16:28 +00:00
Mark Salyzyn
1fe5820269
am ea65c191
: Merge "libctest: zap"
...
* commit 'ea65c191e7c08233c97c5b854537d2a0d2127733':
libctest: zap
2014-05-21 21:08:24 +00:00
Mark Salyzyn
ea65c191e7
Merge "libctest: zap"
2014-05-21 21:02:10 +00:00
Ying Wang
3d2f5d6edb
Remove .swp file checked in by accident.
...
Change-Id: I612ff98d53f46abfc6cb51a820ecde2820442940
2014-05-21 13:35:18 -07:00
Mark Salyzyn
ae0d241144
libctest: zap
...
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
2014-05-21 13:27:58 -07:00
Ed Heyl
a8df7e37b7
Merge "check build tests modules in eng and userdebug builds"
2014-05-21 20:15:06 +00:00
Svetoslav Ganov
78d5e6ea4e
Merge "Revert "Fix build: Revert "Switching to the final PDF rendering library"""
2014-05-21 20:11:47 +00:00
Svetoslav Ganov
0e7533fca5
Revert "Fix build: Revert "Switching to the final PDF rendering library""
...
This reverts commit fa4f6471c4
.
Change-Id: I7541ddad1302ca0f39aec62e3c4ca399046e56a6
2014-05-21 19:40:31 +00:00
Ed Heyl
2cafe7a87f
Merge "Fix build: Revert "Switching to the final PDF rendering library""
2014-05-21 19:23:36 +00:00
Ed Heyl
fa4f6471c4
Fix build: Revert "Switching to the final PDF rendering library"
...
This reverts commit 7a32ace471
.
Change-Id: Icf5b4e16e12a0ca6f7fb662472801f90840a743f
2014-05-21 19:21:54 +00:00
Sreeram Ramachandran
a81c97c04c
Put back the netd_client library internally.
...
Change-Id: I0682377466d6ecb2c56f582369a65fd37ab8063a
2014-05-21 11:13:46 -07:00
Sreeram Ramachandran
873c3a9626
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.
2014-05-21 18:10:22 +00:00
Ying Wang
c2c368fb76
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
2014-05-21 11:00:57 -07:00
Svetoslav
7a32ace471
Switching to the final PDF rendering library
...
Change-Id: I27fdb9b937fa08986f52084d3647d4d23d2db6a4
2014-05-21 10:40:00 -07:00
Sreeram Ramachandran
baf9741d55
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.
2014-05-21 17:04:16 +00:00
Sreeram Ramachandran
feb371ad6b
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.
2014-05-21 17:01:40 +00:00
Sreeram Ramachandran
90a0edbc0b
Merge "Remove netd_client. It has moved to the internal tree."
2014-05-21 16:59:25 +00:00
Sreeram Ramachandran
a7877a4674
Remove netd_client. It has moved to the internal tree.
...
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
2014-05-21 09:55:44 -07:00
Eric Laurent
08f9097e39
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
2014-05-21 08:04:50 -07:00
The Android Automerger
39725ab694
"AAV51"
2014-05-21 05:52:26 -07:00
The Android Automerger
d527a8a755
merge in master-release history after reset to f218d88243
2014-05-21 05:49:24 -07:00
Griff Hazen
f218d88243
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
2014-05-21 03:47:58 +00:00
Griff Hazen
0413efd261
resolved conflicts for merge of 3bb81eb0
to klp-modular-dev-plus-aosp
2014-05-20 20:05:08 -07:00
Justin Koh
3bb81eb04d
Merge "Set API version for KKWT. DO NOT MERGE" into klp-modular-dev
2014-05-21 02:42:33 +00:00
Ying Wang
6fdea52a15
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
2014-05-21 01:12:15 +00:00
Ying Wang
2f4c0a8617
am 8a724260
: am 4e151105
: Merge "Support to extract JNI libs from prebuilt APK"
...
* commit '8a724260f2a3900808e0e733b893a37c119fe3f1':
Support to extract JNI libs from prebuilt APK
2014-05-21 01:10:15 +00:00
Ying Wang
8a724260f2
am 4e151105
: Merge "Support to extract JNI libs from prebuilt APK"
...
* commit '4e151105a02ba09acb277c6a084252d01c561a5f':
Support to extract JNI libs from prebuilt APK
2014-05-21 01:06:03 +00:00
Ying Wang
4e151105a0
Merge "Support to extract JNI libs from prebuilt APK"
2014-05-21 01:02:57 +00:00
Ying Wang
7cf9f28b5f
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
2014-05-20 18:02:17 -07:00
Elliott Hughes
5ef394b824
am d72b3164
: am e972f9ff
: am 0dbcff95
: Merge "The generic_arm64 system image is full."
...
* commit 'd72b3164bdb731dd9871b221fe8db099a1f94514':
The generic_arm64 system image is full.
2014-05-21 00:01:45 +00:00
Christopher Ferris
5b7030390f
am bcbf9ae4
: am 965f3919
: am a2cd924b
: Merge "Fix extra/missing : in path setup."
...
* commit 'bcbf9ae4de41b2cd98ef96f61066496030ef31a1':
Fix extra/missing : in path setup.
2014-05-21 00:01:44 +00:00
Elliott Hughes
d72b3164bd
am e972f9ff
: am 0dbcff95
: Merge "The generic_arm64 system image is full."
...
* commit 'e972f9ffc00c09d3071c899c68c5de31dd4d122a':
The generic_arm64 system image is full.
2014-05-20 23:40:01 +00:00
Christopher Ferris
bcbf9ae4de
am 965f3919
: am a2cd924b
: Merge "Fix extra/missing : in path setup."
...
* commit '965f39190cb50d97b98d47ba8ca205661cfa2c3d':
Fix extra/missing : in path setup.
2014-05-20 23:40:00 +00:00