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
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
Elliott Hughes
e972f9ffc0
am 0dbcff95
: Merge "The generic_arm64 system image is full."
...
* commit '0dbcff9599be1f999df467b7d17b4f2785a8452a':
The generic_arm64 system image is full.
2014-05-20 23:36:30 +00:00
Christopher Ferris
965f39190c
am a2cd924b
: Merge "Fix extra/missing : in path setup."
...
* commit 'a2cd924bef556cb6ceccca1098cae338d37200a6':
Fix extra/missing : in path setup.
2014-05-20 23:36:28 +00:00
Ying Wang
6efad2e0f0
Merge "Fix typo."
2014-05-20 23:21:36 +00:00
Ying Wang
80b91d9ac6
Fix typo.
...
Change-Id: I027b91d3a89de12a9c9f95406274726574bc7f7a
2014-05-20 16:20:44 -07:00
Yuncheol Heo
24b701ca67
Merge "Fix the path for findbugs."
2014-05-20 22:50:06 +00:00
Elliott Hughes
0dbcff9599
Merge "The generic_arm64 system image is full."
2014-05-20 21:48:10 +00:00
Elliott Hughes
0499399231
The generic_arm64 system image is full.
...
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
2014-05-20 14:44:26 -07:00
Christopher Ferris
a2cd924bef
Merge "Fix extra/missing : in path setup."
2014-05-20 21:18:51 +00:00
Christopher Ferris
7110f241ab
Fix extra/missing : in path setup.
...
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
2014-05-20 14:09:36 -07:00
Scott Main
7b93f1e506
am 29498430
: am a8fcb35e
: am e0968f0e
: am c426499e
: add 2x version of logo for sticky bar
...
* commit '29498430029f5a4925e37db4abbf8b6fde4d6f4d':
add 2x version of logo for sticky bar
2014-05-20 18:16:17 +00:00
Ben Cheng
35dcb507f7
am dfec8f89
: am 50e99111
: am 54bea362
: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4 )"
...
* commit 'dfec8f8915ea5870c5e43549a1230d33585b6d89':
Use aarch64-linux-android-4.9 for arm64 build (attempt #4 )
2014-05-20 18:16:12 +00:00
Ben Murdoch
fe7b5c04dd
am fac17e16
: am 0861ed07
: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
...
* commit 'fac17e16a5ffd46d2f649e4b230503acb6013431':
Have core_tiny depend on the NullWebView.
2014-05-20 18:15:42 +00:00
Ben Murdoch
a9136595b8
am 527ce064
: am cf8cd38f
: Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev
...
* commit '527ce064c9c68affd1fc08f982f0850789ba4c89':
All devices that depend on WebView must have the system feature.
2014-05-20 18:15:41 +00:00
Scott Main
2949843002
am a8fcb35e
: am e0968f0e
: am c426499e
: add 2x version of logo for sticky bar
...
* commit 'a8fcb35ec1901194fe82ba3d1054c1a919e2c1d2':
add 2x version of logo for sticky bar
2014-05-20 17:21:55 +00:00
Scott Main
a8fcb35ec1
am e0968f0e
: am c426499e
: add 2x version of logo for sticky bar
...
* commit 'e0968f0e7027f894f3ff5a630720f12016d7202b':
add 2x version of logo for sticky bar
2014-05-20 17:19:22 +00:00
Scott Main
e0968f0e70
am c426499e
: add 2x version of logo for sticky bar
...
* commit 'c426499ee8e8a3f6df85e46930a6c5aec9cf3d25':
add 2x version of logo for sticky bar
2014-05-20 17:16:03 +00:00
Scott Main
c426499ee8
add 2x version of logo for sticky bar
...
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
2014-05-20 10:11:17 -07:00
Ben Cheng
dfec8f8915
am 50e99111
: am 54bea362
: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4 )"
...
* commit '50e99111795af08c7a9c687da6680554c2b54f80':
Use aarch64-linux-android-4.9 for arm64 build (attempt #4 )
2014-05-20 16:08:07 +00:00
Ben Cheng
50e9911179
am 54bea362
: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4 )"
...
* commit '54bea362ab7f33791bd6ea54d77a76dc8d9e005d':
Use aarch64-linux-android-4.9 for arm64 build (attempt #4 )
2014-05-20 16:04:17 +00:00