Commit Graph

9565 Commits

Author SHA1 Message Date
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
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
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
Mohamad Ayyash 5d65020e44 Always build squashfs host tools
Now that mac compatibility has been fixed

BUG: 27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-04 12:31:41 -07:00
Julien Desprez 1287843ab7 Add vts to build in ninja
Bug: 27687012
Change-Id: Icb94e3eee71a8f54f13f868fa2461b2063e7ca6d
2016-04-01 15:39:48 +01:00
Miao Wang a529cebde8 Merge "[RenderScript] Update the build rules for x86_64 support lib." into nyc-dev 2016-03-31 22:25:10 +00:00
Johan Redestig 8d3311f50d DO NOT MERGE ANYWHERE - Add libbase to otatools
build_verity_tree uses libbase since b104044.

Change-Id: I6d3406a107ceb6cd58d1a51aa79935209d4c435f
2016-03-31 14:20:38 -07:00
Miao Wang 57ef7ea490 [RenderScript] Update the build rules for x86_64 support lib.
Bug: 19735423

  - Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need
    to search for libm.so and libc.so in lib64/. Otherwise the linker
    will report error.

Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6
2016-03-31 14:05:33 -07:00
Ying Wang 9109282846 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" into nyc-dev 2016-03-31 18:06:27 +00:00
Sebastien Hertz d9641e01f3 Fix code coverage for apps
When building apps with EMMA_INSTRUMENT=true, we must ensure that
jacoco is at least on the classpath (or even embedded for unbundled
branches) and that proguard will ignore jacoco classes. Otherwise
the Jack compilation would fail.

For unbundled build, we include the proguard configuration file
build/core/proguard.jacoco.flags to ignore jacoco classes.

For full build, we ensure jacoco is on the classpath during the
jack compilation.

Bug: 27607712
Change-Id: I0ad37d74e63028a8144a125f052dc1c5fa10fc66
2016-03-31 18:33:57 +02:00
Sebastien Hertz 301d5955da Merge "Rename emma coverage files" into nyc-dev 2016-03-31 06:58:30 +00:00
Colin Cross bbb7b1b620 Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
* changes:
  Handle symlinked OUT_DIRs (again)
  Handle out being a symlink
2016-03-30 22:18:34 +00:00
Dan Willemsen ae18638b04 Handle symlinked OUT_DIRs (again)
My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.

This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.

Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:

 1) Soong generates out.angler/soong/Android.mk
 2) Kati's find generator produces in-memory tree of the filesystem
 3) $(shell ) creates out.angler/Android.mk
 4) The emulated findleaves Android.mk search finds
    out.angler/soong/Android.mk since the in-memory tree is never updated.

This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.

Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
(cherry picked from commit cc60f01357)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:57 -07:00
Dan Willemsen 4e2677eaf1 Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.

Bug: 27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
(cherry picked from commit d53c0c7b45)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:44 -07:00
Neil Fuller b08544ed7d Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.

Bug: 27475234
Bug: 26753820
Bug: 26604040
Change-Id: Ifc79eebabfc6b64c0daf6b9ca236d1967a45a735
2016-03-30 11:01:33 -07:00
Sebastien Hertz 6ec1f057dc Rename emma coverage files
We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.

This CL renames coverage files generated by emma so they no longer
break those created by Jack.

Keep coverage.em file name for host rules where Jack is not called.

Bug: 27822188

(cherry picked from commit 491c9ce48a
&& commit 8f0e52c3a6)

Change-Id: I26beee5a8d42a2ef1d476661e4b591fb09f1276f
2016-03-30 19:03:34 +02:00
Ying Wang 19b8145447 Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev 2016-03-29 21:31:24 +00:00
Allen Hair eda71810b8 Merge "Only add jacocoagent if the package contains some java code." into nyc-dev 2016-03-29 21:18:24 +00:00
Ying Wang 6f9bd2a972 Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt
In commit e758f9319d we switched from
TARGET_AAPT_CHARACTERISTICS to PRIVATE_TARGET_AAPT_CHARACTERISTICS in
add-assets-to-package but forgot to set the variable when we are running
the old aapt.

Bug: 27874886
Change-Id: I03ced3030dcb9f024eef5b23dbfd5d99157952ea
2016-03-29 12:41:42 -07:00
Colin Cross 4aca571552 Remove -d keepdepfile from ninja command line DO NOT MERGE
keepdepfile is not supported by the ninja prebuilt in nyc-dev.

Bug: 27886012
Change-Id: Ia4f0b15916618b1b7caa2abb53e25f87737b5288
2016-03-29 12:10:53 -07:00
Shinichiro Hamaji 0f846c73e1 Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.

Bug: 26839129
Bug: 27886012
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
(cherry picked from commit 72904774a3)
2016-03-29 12:10:48 -07:00
Shinichiro Hamaji 2fb7b61a2e Use KATI_DEPFILE for .P associated with object files
Also specify "-d keepdepfile" to ninja so .P files won't be
deleted by ninja.

-include for .s files are removed because GCC doesn't
generate .d files for .s files.

Bug: 26839129
Bug: 27886012
Change-Id: If00e93c7a33449ec314a5cdba438475a32979f4e
(cherry picked from commit 4037c4225a)
2016-03-29 12:10:03 -07:00
Baligh Uddin f9d685008d Add ability to package verifiedboot keys 2016-03-28 13:09:03 -07:00
Allen Hair 0f85562384 Only add jacocoagent if the package contains some java code.
Bug: 27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
2016-03-28 12:52:37 -07:00
Shinichiro Hamaji a73d4297a0 Link everything in libpthread.a to ckati
With this workaround, we can delete a lot of unnecessary code
in ckati: https://github.com/google/kati/commit/8380fb8525adfb5

Bug: 26839129
Change-Id: I3de1bf4cd6f2a65ee9322e8504459621871612fc
(cherry picked from commit f4511161d5)
2016-03-25 14:01:16 -07:00
Colin Cross c031c758c6 Merge "Ignore Android.mk files with USE_SOONG=true" into nyc-dev 2016-03-25 19:54:30 +00:00
Ying Wang efaf5efd06 Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules.
So that we don't mess up with the vendor path check by accident.

Bug: 27543283
Change-Id: I6c34caefe3ff4abfdd8349a32c68fcca524cfd8e
2016-03-24 17:24:38 -07:00
Colin Cross 946a08cf51 Ignore Android.mk files with USE_SOONG=true
When USE_SOONG=true, ignore any Android.mk file that has an Android.bp
file in the same directory.

Change-Id: Id79bd90c2aed5dafc2f8ad2c5b7eb0aa6e81dc18
(cherry picked from commit 861ab99536)
2016-03-24 14:36:48 -07:00
Zach Jang 901590ae2a Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d am: 0cf7987
am: ae7c301

* commit 'ae7c3010265171b2c215c5a30049320ba50265a7':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:10:42 +00:00
Zach Jang 0cf7987b7e Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684
am: f32d07d

* commit 'f32d07dd9328401525e333a34464a1d1f363e524':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:03:47 +00:00
Zach Jang f32d07dd93 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea
am: 6bbd684

* commit '6bbd684464a1307f074e6c173a9147d6e2a626f1':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:00:15 +00:00
Zach Jang 6bbd684464 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483
am: 08d9bea

* commit '08d9bea41096f7c055cf67860a07436da6712b01':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:56:45 +00:00