p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
28,244 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

9595 Commits

Author SHA1 Message Date
Alex Klyubin 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
Nicholas Sauer 40ef6697be Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev 2016-05-11 14:35:15 +00:00
Nicholas Sauer 088230cb34 Add org.apache.harmony.tests.javax.xml to old cts 
bug: 28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
 2016-05-10 12:54:32 -07:00
Andreas Gampe 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)

Change-Id: Ifd59d854f01ad8cf703f16d7a6e88c2c82d47feb
 2016-05-09 22:42:27 +00:00
Tao Bao 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
Adam Lesinski dfd6197f51 Merge "Call aapt2 link with argument-list" into nyc-dev 2016-04-29 22:09:01 +00:00
Todd Kennedy 1ccfe52630 Merge "Only align when necessary" into nyc-dev 2016-04-29 20:59:04 +00:00
Todd Kennedy 3f18099610 Only align when necessary 
Bug: 27887819
Change-Id: Ie8b5ca31cc1c08943588fc6039d75190ff7eeb8b
 2016-04-29 13:58:13 -07:00
Adam Lesinski 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
Adam Lesinski 6c078e0522 Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev 2016-04-28 20:10:17 +00:00
Adam Lesinski 4c44d94999 Revert "Call aapt2 link with argument-list" 
This reverts commit d4d6a50fbb.

Change-Id: If84ad9921eb51ae16eae2be3cf4b2ee86b31ce80
 2016-04-28 20:06:53 +00:00
Adam Lesinski 0e57d3afc1 Merge "Call aapt2 link with argument-list" into nyc-dev 2016-04-28 19:34:32 +00:00
TreeHugger Robot 2c7fd2d170 Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev 2016-04-28 05:07:55 +00:00
Mohamad Ayyash 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
Igor Murashkin 5ec15a52b1 old-cts: Add testng and libcoreoj test support 
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32708
 2016-04-26 17:47:45 -07:00
Adam Lesinski 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
Narayan Kamath 9a611b27fc Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev 2016-04-26 13:22:08 +00:00
Narayan Kamath 51b3f1da0b Revert "old-cts: Add testng and libcoreoj test support" 
This reverts commit 1d4ad6a527.

This topic has been reverted because it causes build flakiness and
bogus verification failures on most active changes.

Change-Id: I4a935c9a861e063e28ddc1c35bc3fa015174e81d
 2016-04-26 13:14:55 +00:00
Igor Murashkin 1cb8adb1fa Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev 2016-04-25 23:39:16 +00:00
Mohamad Ayyash 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
Keun Soo Yim 3d4847525f build rule change for VTS (vendor test suite)'s metadata files 
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
 2016-04-25 13:06:57 -07:00
Zach Jang b5658074c3 Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd am: d402579 
am: 3f578d2

* commit '3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
  Update security patch string to 2016-06-01

Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
 2016-04-20 22:11:57 +00:00
Zach Jang d402579bc0 Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b 
am: 63398dd

* commit '63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
  Update security patch string to 2016-06-01

Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d
 2016-04-20 21:47:54 +00:00
Zach Jang 63398dd7ea Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 
am: d4b8d2b

* commit 'd4b8d2b59f804544e09cb3e600ff290792470999':
  Update security patch string to 2016-06-01

Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
 2016-04-20 21:42:16 +00:00
Zach Jang d4b8d2b59f Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 
am: 05a8c77

* commit '05a8c77e4231828db15aee343f79ebd2dd6607dd':
  Update security patch string to 2016-06-01

Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
 2016-04-20 21:35:11 +00:00
Zach Jang 05a8c77e42 Update security patch string to 2016-06-01 am: 0a3b3d4 
am: 0ca3757

* commit '0ca37573e53bc3a481daa3a807dfc6960227fb0f':
  Update security patch string to 2016-06-01

Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
 2016-04-20 19:50:19 +00:00
Zach Jang 0ca37573e5 Update security patch string to 2016-06-01 
am: 0a3b3d4

* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
  Update security patch string to 2016-06-01

Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
 2016-04-20 18:49:54 +00:00
TreeHugger Robot 816dd48126 Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev 2016-04-20 01:54:54 +00:00
Colin Cross 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
Ying Wang 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)

Change-Id: I5d9b7f7214d98a1bf953fadb9951a8af1e993057
 2016-04-19 14:26:58 -07:00
Zach Jang 0a3b3d40c1 Update security patch string to 2016-06-01 
b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
 2016-04-19 10:56:31 -07:00
Sebastien Hertz ad84f802fc Merge "Allow to force min sdk given to Jack" into nyc-dev 2016-04-14 23:17:18 +00:00
Tao Bao 8fe9274ab9 Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev 2016-04-14 22:11:18 +00:00
Yohann Roussel d98c42071a Allow to force min sdk given to Jack 
Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.

Bug: 28188420

(cherry picked from commit 109141ccc9)

Change-Id: Id9c5275bc71b8d9042173bf1e40aa3199e9508e6
 2016-04-14 23:25:14 +02:00
Tao Bao cffaf73f84 Makefile: Pack squashfs and f2fs tools into otatools.zip. 
The following tools are essential to create squashfs and f2fs images
during signing (if applicable).

squashfs: mksquashfs and mksquashfsimage.sh
f2fs: make_f2fs and mkf2fsuserimg.sh

Bug: 28179154
Change-Id: Ia48bc6d9a40d2667bc6f2c973bd0c55eed7a06fc
 2016-04-14 13:33:35 -07:00
Ying Wang 2e2c137913 Reject Google's build of JDK. 
Bug: 28097637

(cherry picked from commit 22b23b9b00)

Change-Id: Ieb809cdd0ba930b9ea65b8b0d31a81be112cc52e
 2016-04-14 12:30:25 -07:00
Andreas Gampe 4b941608e9 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" into nyc-dev 2016-04-12 22:19:04 +00:00
Andreas Gampe 7928bc8554 Build: Add ART_BOOT_IMAGE_EXTRA_ARGS 
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.

Bug: 27265238

(cherry picked from commit 907fb03273)

Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
 2016-04-12 14:24:50 -07:00
Ying Wang 8419b7f35e Include classes.jar with class files in aar. 
As we switched to Jack the LOCAL_BUILT_MODULE (javalib.jar) now
include .jayce files.

Change-Id: If802e02bb20a9e105ca9563e6fe483f7acce00e6
 2016-04-12 12:57:36 -07:00
Julien Desprez 188a1dd18f Benchmark have their own folder 
Benchmark tests use a separate folder from native tests.

Bug: 27465556
Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e
 2016-04-12 18:57:36 +01:00
Dan Willemsen 758f872836 Merge "Ensure prebuilt executables are executable" into nyc-dev 2016-04-11 19:59:10 +00:00
Dan Willemsen 23f326a67d Ensure prebuilt executables are executable 
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Bug: 28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit 08420cbc8a)
 2016-04-11 11:21:47 -07:00
Sebastien Hertz 18da8dd97a Update code coverage filtering 
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).

When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.

Bug: 28014424

(cherry picked from commit 74ec3f49d1)

Change-Id: Ie4253981c0e6a62422ab84dfd67ef5eebc0b0284
 2016-04-11 16:43:12 +02:00
Ian Pedowitz 839ec10bbc PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3 
Bug: 27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
 2016-04-08 14:05:00 -07:00
Igor Murashkin 1d4ad6a527 old-cts: Add testng and libcoreoj test support 
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
 2016-04-07 16:55:08 -07:00
Joe Onorato 4b60ee5b7b Merge changes I8f95f3f8,Ic2e384ad into nyc-dev 
* changes:
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.
 2016-04-07 18:34:43 +00:00
Joe Onorato 48bd6f53f4 Add generation of a module-info.json file 
This outputs all of the modules that the build system knows about
for this invocation.

Change-Id: I8f95f3f8443c18f7898ce90e287432cbd2b6db6d
 2016-04-06 19:11:51 -07:00
Joe Onorato 969b6f8ada Remove unused module-info.txt generation. 
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
 2016-04-06 14:49:55 -07:00
Sebastien Hertz e771251424 Merge "Fix code coverage for apps" into nyc-dev 2016-04-05 07:11:48 +00:00
Mohamad Ayyash 21e6bf3b38 Merge "Always build squashfs host tools" into nyc-dev 2016-04-04 19:46:48 +00:00