cf51c6cb29
resolve merge conflicts of 12db224 to lmp-mr1-dev
...
am: 0c672afc40
2016-06-22 01:27:49 +00:00
0c672afc40
resolve merge conflicts of 12db224 to lmp-mr1-dev
...
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
2016-06-21 18:23:46 -07:00
12db224269
resolve merge conflicts of 24cfbfa to lmp-dev
...
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
2016-06-21 18:13:17 -07:00
24cfbfabb7
Updating security string to 2016-08-05 am: 5b14c1f7ce
...
am: 26acdf0c13
2016-06-22 00:44:33 +00:00
26acdf0c13
Updating security string to 2016-08-05
...
am: 5b14c1f7ce
2016-06-22 00:41:51 +00:00
5b14c1f7ce
Updating security string to 2016-08-05
...
b/29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
2016-06-20 14:30:52 -07:00
8ebbc4e7e2
Merge "squashfs: make disable-4k-align a parameter" into nyc-dev
2016-06-16 16:24:34 +00:00
1b6d3485fc
squashfs: make disable-4k-align a parameter
...
BUG: 29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-15 16:37:21 -07:00
b00263f96a
Skip uses-library check for preopted apps.
...
Bug: 26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
2016-06-13 17:32:06 -07:00
c20df7057d
disable unpriv perf by default in user{,debug} builds
...
(Cherry picked from commit f2ac912b19
2016-06-12 21:19:56 +00:00
ddc0c5e0a0
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
2016-06-08 03:05:40 +00:00
837b86aa56
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
2016-06-07 16:21:16 +00:00
7a50757731
NYC is 7.0
...
Bug: 29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
2016-06-06 17:08:18 +00:00
5fcdec083e
Removing N from PLATFORM_VERSION_ALL_CODENAMES
...
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes: 29117805
2016-06-06 10:06:39 -07:00
f2304ce367
NYC is now REL
...
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now
Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
2016-06-03 09:40:41 -07:00
81ee18670d
Add variable PRODUCT_SHIPPING_API_LEVEL.
...
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with.
We use this variable to set a read-only property that can be used in
CTS/GTS tests.
Bug: 26381401
Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
2016-06-03 09:11:34 +00:00
888a623881
disable unpriv perf by default in user{,debug} builds
...
(Cherry picked from commit fe01f56c0d5c42508e1e82f5976e4c10bb00f632)
Bug: 29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-06-01 17:01:18 -07:00
9f527d5222
Add system/extras/verity/build_verity_metadata.py to otatools am: e718501021
...
am: 5d77e7e0c1
2016-05-27 23:42:55 +00:00
5d77e7e0c1
Add system/extras/verity/build_verity_metadata.py to otatools
...
am: e718501021
2016-05-27 23:40:02 +00:00
e718501021
Add system/extras/verity/build_verity_metadata.py to otatools
...
Bug: 29008004
2016-05-27 16:28:36 -07:00
442ae0fe5c
DO NOT MERGE ANYWHERE -
...
Broke the build in mnc-dr-dev
Revert "Add system/extras/verity/build_verity_metadata.py to otatools"
Bug: 29008004
This reverts commit d26a99c3c6
2016-05-27 23:19:57 +00:00
b25a7f38a8
Add system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6
...
am: 1e7c1290c6
2016-05-27 22:40:22 +00:00
1e7c1290c6
Add system/extras/verity/build_verity_metadata.py to otatools
...
am: d26a99c3c6
2016-05-27 22:37:29 +00:00
d26a99c3c6
Add system/extras/verity/build_verity_metadata.py to otatools
...
Bug: 29008004
2016-05-27 15:19:31 -07:00
aef86f7f4c
Add build number to apps' version name for non-platform build
...
If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.
Bug: 28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863
2016-05-26 12:32:30 -07:00
f211cae2ed
Merge "N is API 24" into nyc-dev
2016-05-26 01:03:09 +00:00
891d86d492
N is API 24
...
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
2016-05-25 16:48:56 -07:00
e29b42ffef
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd
...
am: cf227d4401
2016-05-25 21:02:20 +00:00
cf227d4401
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83
...
am: 4af9b20fbd
2016-05-25 20:57:41 +00:00
4af9b20fbd
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4
...
am: db34ed5f83
2016-05-25 20:52:57 +00:00
db34ed5f83
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0
...
am: bf5d08ecf4
2016-05-25 20:44:22 +00:00
bf5d08ecf4
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad
...
am: 7cc20fe0a0
2016-05-25 20:39:28 +00:00
7cc20fe0a0
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f
...
am: e7660e56ad
2016-05-25 20:34:46 +00:00
e7660e56ad
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
...
am: ab6c08949f
2016-05-25 20:30:14 +00:00
60270ec785
DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375
...
am: 555c5af89a
2016-05-25 20:07:30 +00:00
555c5af89a
DO NOT MERGE Updating security string to 2016-07-05
...
am: f885e95375
2016-05-25 20:03:05 +00:00
f885e95375
DO NOT MERGE Updating security string to 2016-07-05
...
b/28912173
Change-Id: I81301d51fd62932005a24178c57a0731566910a6
2016-05-25 19:43:28 +00:00
ea3b024d7d
Updating security string to 2016-07-05
...
b/28912173
Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
2016-05-25 12:38:46 -07:00
f8a869d5d8
Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c
...
am: 3ffee87b5c
2016-05-24 01:19:54 +00:00
3ffee87b5c
Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07
...
am: 2d75d4447c
2016-05-24 01:17:01 +00:00
2d75d4447c
Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64
...
am: 608f329e07
2016-05-24 01:14:26 +00:00
608f329e07
Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d
...
am: 3e082f1e64
2016-05-24 01:11:45 +00:00
3e082f1e64
Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78
...
am: 0b4608ca4d
2016-05-24 01:09:15 +00:00
2ee84bf0a5
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01
...
am: 0bdac8fba3
2016-05-24 01:06:37 +00:00
0b4608ca4d
Updating security string to 2016-07-01 am: 45ff24a04b
...
am: 1dd3095e78
2016-05-24 01:06:37 +00:00
1dd3095e78
Updating security string to 2016-07-01
...
am: 45ff24a04b
2016-05-24 01:02:06 +00:00
0bdac8fba3
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
...
am: 89f6f7aa01
2016-05-24 01:02:05 +00:00
45ff24a04b
Updating security string to 2016-07-01
...
b/28912173
Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
2016-05-23 13:26:32 -07:00
89f6f7aa01
DO NOT MERGE Updating security string to 2016-07-01
...
- for klp-dev only
b/28912173
Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
2016-05-23 13:19:30 -07:00
0418406186
Merge commit '9b4daacaf8f7ce5a534fae524507e4a4f7622ce4' into nyc-dev
2016-05-20 17:27:18 -07:00
9b4daacaf8
Merge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev
2016-05-20 17:14:04 -07:00
6c70b85cb3
Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
...
am: 275af3429f
2016-05-21 00:04:37 +00:00
275af3429f
Merge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev
2016-05-20 16:59:14 -07:00
8c0c5e6149
Merge commit \'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
...
am: 50cae53b10
2016-05-20 23:50:56 +00:00
50cae53b10
Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev
2016-05-20 16:44:27 -07:00
c1937df4b1
Add Oem Props to otatools package
...
am: 4f8df41cef
2016-05-20 18:43:25 +00:00
4f8df41cef
Add Oem Props to otatools package
...
Bug: 23967152
2016-05-20 11:29:53 -07:00
88b0d6a63d
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
2016-05-19 19:39:11 +00:00
74da4d6eef
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
...
otatools.zip is used to release key sign device images.
Bug: 23967152
2016-05-19 08:50:19 -07:00
587484abe5
Uncompress native libs only if they are compressed.
...
This changes the build system to uncompress native libraries in
preinstalled APKs only if the libraries are actually compressed.
Previously, any preinstalled APK containing native libraries was
modified by having all native libraries removed from the APK and then
re-added to the APK in uncompressed form.
Bug: 27887819
Change-Id: I3db172133e141bb6282bf3ed7070b068a826724e
2016-05-17 13:33:34 -07:00
c608284d22
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
...
am: 5b30101722
2016-05-16 15:01:38 +00:00
e5368fa373
Add documents-archive to SDK, docs builds
...
Bug: 28762753
Change-Id: I169adfb3124aac92cb3b96966667a2f8b4b78472
2016-05-13 14:17:33 -04:00
55e80ef5c4
Add missing support library projects to pathmap
...
Bug: 28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409
2016-05-13 14:15:25 -04:00
f193546d65
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
...
Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
2016-05-12 15:55:26 -07:00
8313541c65
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
...
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
16690162c3
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
...
This is needed for nemo* signing off emerald-dev.
Bug: 28726512
2016-05-11 16:32:17 -07:00
f59ad14c1f
Fix handling of version codes in minSdkVersion when signing.
...
The APK signing tool, build/tools/signapk, needs to know the API Level
of the oldest platform supported by the APK. The APK's minSdkVersion
may reference that using a number (API Level) or a version code. To
handle the version code case, the existing logic was to see if it
matches $PLATFORM_VERSION_CODENAME and then substitute it with
$PLATFORM_SDK_VERSION.
However, some platforms support multiple version codes. To handle this
scenario, this commit changes the logic for computing the min API
Level for signing purposes to treat any non-numeric minSdkVersion as
$PLATFORM_SDK_VERSION.
Bug: 28715556
Change-Id: I292c96e8928b7e2f8d9716ef2be33a23a87764c4
2016-05-11 12:11:11 -07:00
40ef6697be
Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev
2016-05-11 14:35:15 +00:00
088230cb34
Add org.apache.harmony.tests.javax.xml to old cts
...
bug: 28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
2016-05-10 12:54:32 -07:00
a20910f495
Build: Switch on oat file mini-debug-info for boot.oat
...
Enable mini-debug-info for the boot image by default. This
can be disabled with WITH_DEXPREOPT_DEBUG_INFO=false.
Bug: 28474219
(cherry picked from commit 58f6bfaa37
2016-05-09 22:42:27 +00:00
f54216f292
Pack base_fs files into target_files.zip.
...
Pack the base_fs files ({system,vendor}.map) into target_files.zip,
which would be needed when rebuilding the images at signing.
Reset the base_fs paths to point to the files in META/.
Also add blk_alloc_to_base_fs into otatools.zip.
Bug: 27698960
Change-Id: If4eb274b3f3d839c4365624f46f0dc89bd2fa440
2016-04-30 23:56:10 -07:00
dfd6197f51
Merge "Call aapt2 link with argument-list" into nyc-dev
2016-04-29 22:09:01 +00:00
1ccfe52630
Merge "Only align when necessary" into nyc-dev
2016-04-29 20:59:04 +00:00
3f18099610
Only align when necessary
...
Bug: 27887819
Change-Id: Ie8b5ca31cc1c08943588fc6039d75190ff7eeb8b
2016-04-29 13:58:13 -07:00
8d1e2fdcba
Call aapt2 link with argument-list
...
Also follow symbolic links when looking for assets.
Bug:22775504
Change-Id: I971e23505f766a2192469df1aad55bc20c46f618
2016-04-28 15:10:18 -07:00
6c078e0522
Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev
2016-04-28 20:10:17 +00:00
4c44d94999
Revert "Call aapt2 link with argument-list"
...
This reverts commit d4d6a50fbb
2016-04-28 20:06:53 +00:00
0e57d3afc1
Merge "Call aapt2 link with argument-list" into nyc-dev
2016-04-28 19:34:32 +00:00
2c7fd2d170
Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev
2016-04-28 05:07:55 +00:00
b88afd7aca
Merge "Rename incr ext4 base_fs path vars. Add to product_var_list." into nyc-dev
2016-04-27 21:15:05 +00:00
5ec15a52b1
old-cts: Add testng and libcoreoj test support
...
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32708
2016-04-26 17:47:45 -07:00
d4d6a50fbb
Call aapt2 link with argument-list
...
Also follow symbolic links when looking for assets.
Bug:22775504
Change-Id: I78b4e2b7d7750dfecafd64e29cf0e19dff851155
2016-04-26 13:32:01 -07:00
9a611b27fc
Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev
2016-04-26 13:22:08 +00:00
51b3f1da0b
Revert "old-cts: Add testng and libcoreoj test support"
...
This reverts commit 1d4ad6a527
2016-04-26 13:14:55 +00:00
1cb8adb1fa
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
2016-04-25 23:39:16 +00:00
1868a601b7
Rename incr ext4 base_fs path vars. Add to product_var_list.
...
BUG: 27698960
Change-Id: I4624f782846ee54525d0ac29b866a04c0d67aa40
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-25 15:47:42 -07:00
3d4847525f
build rule change for VTS (vendor test suite)'s metadata files
...
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
2016-04-25 13:06:57 -07:00
69cf5dfc4d
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
...
Bug: 23967152
2016-04-24 12:40:03 -07:00
b5658074c3
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd am: d402579
...
am: 3f578d2
2016-04-20 22:11:57 +00:00
d402579bc0
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b
...
am: 63398dd
2016-04-20 21:47:54 +00:00
63398dd7ea
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77
...
am: d4b8d2b
2016-04-20 21:42:16 +00:00
d4b8d2b59f
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757
...
am: 05a8c77
2016-04-20 21:35:11 +00:00
05a8c77e42
Update security patch string to 2016-06-01 am: 0a3b3d4
...
am: 0ca3757
2016-04-20 19:50:19 +00:00
0ca37573e5
Update security patch string to 2016-06-01
...
am: 0a3b3d4
2016-04-20 18:49:54 +00:00
816dd48126
Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev
2016-04-20 01:54:54 +00:00
febe2bcc21
Make jack_check_timestamp depend on setup-jack-server
...
Some builds were failing with:
[ 3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'
While jack-admin was running concurrently:
[ 3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher
Change-Id: Ib35f313daee93dc6a3548e652cbcd4cb4d304f93
2016-04-19 17:22:29 -07:00
8f8099c96a
Don't reset LOCAL_*MODULE_STEM.
...
By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.
Bug: 27775991
(cherry picked from commit c160c3f21a
2016-04-19 14:26:58 -07:00
0a3b3d40c1
Update security patch string to 2016-06-01
...
b/28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -07:00
ad84f802fc
Merge "Allow to force min sdk given to Jack" into nyc-dev
2016-04-14 23:17:18 +00:00
8fe9274ab9
Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev
2016-04-14 22:11:18 +00:00
Zach Jang