Commit graph

14158 commits

Author SHA1 Message Date
Steven Moreland
cb373600f2 Merge "Update compatibility matrix logic." into oc-mr1-dev
am: d7314b90bd

Change-Id: I72de0f154db027414baf4c09c2b5e050f838a267
2017-09-05 21:14:30 +00:00
TreeHugger Robot
d7314b90bd Merge "Update compatibility matrix logic." into oc-mr1-dev 2017-09-05 20:54:27 +00:00
Nan Zhang
1048094109 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 2fc0f4e484 am: dc8ddb2da5
am: 6248e3fbaf

Change-Id: Ic2235f14a1191d7bf72914b31368a4a9f3819dc3
2017-09-02 19:51:11 +00:00
Nan Zhang
dc8ddb2da5 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
am: 2fc0f4e484

Change-Id: Ic57ec8debe84102c55b63e2bdfb94a41da86d71c
2017-09-02 19:36:10 +00:00
Nan Zhang
9e37028db0 Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor
git-wear-master/mirror-aosp-master-with-vendor were still broken due to
my Make synatx mistakes.

Bug: b/64308460

Test: download <git-wear-master> branch locally, and then do:
m -j out/target/product/anglefish/package-stats.txt

Change-Id: Ic1a03b452db7583811a3a3b74067f1fc54f873b4
2017-09-02 10:25:17 -07:00
Nan Zhang
8e1c7e1455 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 99e44773ba am: e665010297
am: 4a03375cc7

Change-Id: I70f7b31f7e4e017f1358528d13e5bfe5e2ff7242
2017-09-02 05:23:24 +00:00
Nan Zhang
e665010297 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
am: 99e44773ba

Change-Id: If6bb6ff7147e221b85d3750eeddbd1870d464ed8
2017-09-02 05:09:23 +00:00
Nan Zhang
d05e19df41 Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor
The problem is that when I added .KATI_RESTAT for javalib.jar, I didn't
change the function: create-empty-package to generate javalib.jar.tmp.

The problem causes the build breakage on MacOS/Jack.

Bug: b/64308460

Test: download <git-wear-master> branch locally, and then do:
m -j out/target/product/angelfish/package-stats.txt

Change-Id: I9a5d74caaf164b44676e456050b4f8a5b3bdded0
2017-09-01 18:52:41 -07:00
Tao Bao
5b0ebe7304 Merge "Pack system/update_engine/scripts into otatools.zip." am: 27bfc86d8b am: cdfabdbf85
am: 5b8e0ffaf9

Change-Id: I3b1565e7b26a2ab215ff30bc9110df436899a07a
2017-09-01 17:06:07 +00:00
Tao Bao
cdfabdbf85 Merge "Pack system/update_engine/scripts into otatools.zip."
am: 27bfc86d8b

Change-Id: I9899eb544f48e4556117b4c83153a76a3ef72cb9
2017-09-01 16:54:07 +00:00
Tao Bao
27bfc86d8b Merge "Pack system/update_engine/scripts into otatools.zip." 2017-09-01 16:45:08 +00:00
Mathieu Chartier
2df6c08abc Merge "Fix boot image profile in make files" into oc-mr1-dev
am: b9cd7e6ade

Change-Id: I0723fb868816a3148b42367ea7261cc77ccb312b
2017-09-01 02:52:45 +00:00
Mathieu Chartier
b9cd7e6ade Merge "Fix boot image profile in make files" into oc-mr1-dev 2017-09-01 02:47:09 +00:00
Nan Zhang
d1bbc2b26c Merge changes from topic "turbine" am: 872246de0f am: fa8b66f5cc
am: 5d52f85261

Change-Id: I6e71c2e2874bba64f2105c8cf26647ae5c9af25b
2017-09-01 00:37:45 +00:00
Steve Fung
14fc898851 Merge "Only generate breakpad symbols for ELF binaries" am: 14f225b762 am: 55b7eb41a8
am: c6ece010e4

Change-Id: I2f7e60851be0ff375935be1b8fc44b318ead29a6
2017-09-01 00:37:00 +00:00
Bo Hu
1d59beefeb Merge "sdk: add vendor-qem.img into the deps list"
am: cfde9a84bc

Change-Id: I7d28167ff9578ad8c8dc73a4d8a6d9252cfb2cfb
2017-09-01 00:24:57 +00:00
Nan Zhang
fa8b66f5cc Merge changes from topic "turbine"
am: 872246de0f

Change-Id: I13cba047e145d0ab8c486a4ee60d53f2f5470737
2017-09-01 00:21:34 +00:00
Steve Fung
55b7eb41a8 Merge "Only generate breakpad symbols for ELF binaries"
am: 14f225b762

Change-Id: I629664d415422bbfd40cfe026970b8738acb31da
2017-09-01 00:20:41 +00:00
Bo Hu
cfde9a84bc Merge "sdk: add vendor-qem.img into the deps list" 2017-09-01 00:07:48 +00:00
Treehugger Robot
872246de0f Merge changes from topic "turbine"
* changes:
  Revert "Revert "Add Turbine as part of java build toolchain in Make.""
  Remove GLOBAL_JAVAC_DEBUG_FLAGS
2017-09-01 00:01:31 +00:00
bohu
18d1868580 sdk: add vendor-qem.img into the deps list
if it exists. Fix master-without-vendor sdk_x86-sdk build

Change-Id: I5656e7124d30e71120044cce668c54793f77208a
Merged-In: I5656e7124d30e71120044cce668c54793f77208a
(cherry picked from commit a508578811)
2017-08-31 16:57:44 -07:00
Tao Bao
3f4ea7cb88 Pack system/update_engine/scripts into otatools.zip.
The scripts will be needed by OTA releasetools, for parsing A/B OTA
payload.

Bug: 65261072
Test: `m otatools-package` and check for system/update_engine/scripts.
Change-Id: I5cb54561a5fb0454a37879ca20afa95b82ffdefe
2017-08-31 16:42:38 -07:00
Treehugger Robot
14f225b762 Merge "Only generate breakpad symbols for ELF binaries" 2017-08-31 23:37:41 +00:00
Steve Fung
445beae409 Only generate breakpad symbols for ELF binaries
When BREAKPAD_GENERATE_SYMBOLS is set to true, the build will attempt
to run dump_syms for all dynamic binaries.  However some build targets
are now using cc_prebuilt_binary for installing python host scripts.
This causes dump_syms to return an error, causing the build to fail.
So check instead if the file is an ELF binary before running dump_syms.

Bug: 65065674
Test: Built AT target successfully.
Merged-In: Ibe7d3ebd312376600cf21efa111489451a4e7578
Change-Id: Ibe7d3ebd312376600cf21efa111489451a4e7578
(cherry picked from commit ee848655db)
2017-08-31 15:57:44 -07:00
Bo Hu
35149ca0b7 Merge changes from topic "aosp-emulator-oc"
* changes:
  emulator: fix widevine drm vndbinder denial
  emulator: fix selinux issues
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
2017-08-31 22:56:31 +00:00
Nan Zhang
b3ec534bd1 Revert "Revert "Add Turbine as part of java build toolchain in Make.""
This reverts commit 33dcd0c5eb.

Reason for revert: <stub.jar.toc needs classes.jar.toc which is no longer existed after Turbine was introduced. So use classes.jar to represent stub.jar.toc>

Bug: b/64308460
Test: m clean && time m -j32 ANDROID_COMPILE_WITH_JACK=true
Change-Id: If618993f1e0c789d93cc15664212603f994fd460
2017-08-31 14:56:54 -07:00
Colin Cross
9a594e05af Remove GLOBAL_JAVAC_DEBUG_FLAGS
GLOBAL_JAVAC_DEBUG_FLAGS is no longer set, -g is already included
in the javac command line.  Jack is on its way out, just use -g
directly there for now.

Test: m -j checkbuild
Change-Id: Ib99c248bbb8b65fa2cd2b55449a502fc20deffa8
2017-08-31 14:48:31 -07:00
Guang Zhu
63db4a5045 add CTS tradefed harness dependencies to PDK fusion config
am: 73c10bed93

Change-Id: I6f95b9c5b52e469a634e0f14375ecaa127f28ae8
2017-08-31 21:33:12 +00:00
Nan Zhang
3b202bde3f Merge "Revert "Add Turbine as part of java build toolchain in Make."" am: 91ffbf2fbe am: 2c82a22d96
am: 40403cdded

Change-Id: Ib9a5a8506bb85b6582421ed20fa1c11d9aba4375
2017-08-31 20:47:54 +00:00
Nan Zhang
2c82a22d96 Merge "Revert "Add Turbine as part of java build toolchain in Make.""
am: 91ffbf2fbe

Change-Id: I1a1131df064f2243220407dddd3f913ace7d26aa
2017-08-31 20:41:25 +00:00
Jeff Gaston
3db1d9b84a Merge "Implement LOCAL_TARGET_REQUIRED_MODULES" am: 2c0442238b am: d7fe023444
am: 1923a31e9c

Change-Id: I05fc00b6ae97efcf8f11cabb334166e5355a2d83
2017-08-31 20:33:20 +00:00
Nan Zhang
91ffbf2fbe Merge "Revert "Add Turbine as part of java build toolchain in Make."" 2017-08-31 20:32:46 +00:00
Jeff Gaston
d7fe023444 Merge "Implement LOCAL_TARGET_REQUIRED_MODULES"
am: 2c0442238b

Change-Id: Ifb9dccdde667dbbbe93bf9626fd9e0cf9f5f3152
2017-08-31 20:22:49 +00:00
Jeff Gaston
2c0442238b Merge "Implement LOCAL_TARGET_REQUIRED_MODULES" 2017-08-31 20:14:01 +00:00
Nan Zhang
33dcd0c5eb Revert "Add Turbine as part of java build toolchain in Make."
This reverts commit 0739155c86.

Reason for revert: <sdk_google_aw_x86-sdk (linux) build 4310016 in git_master is broken>

Change-Id: I525d48557bd0425917e61a85f596663ccc63c887
2017-08-31 19:56:59 +00:00
Mathieu Chartier
75edf540e2 Fix boot image profile in make files
Update location to framework/base/config instead of frameworks/base

Fixed dex2oat dependency to my_out_boot_image_profile_location
instead of my_out_profile_location.

Bug: 37966211
Test: make and flash

Change-Id: I446f11216cf6342861bbbf56ac5c4da2f36fb755
2017-08-31 12:35:21 -07:00
Nan Zhang
672898977f Merge "Add Turbine as part of java build toolchain in Make." am: 0b23748128 am: 2764a16085
am: 3c30f84e2d

Change-Id: I3e42a07747ffb09b10ab07785d761ddc84574ae0
2017-08-31 18:25:44 +00:00
Nan Zhang
2764a16085 Merge "Add Turbine as part of java build toolchain in Make."
am: 0b23748128

Change-Id: Ieed94b471fea95b91b7bc54da8d3860cb794f921
2017-08-31 18:16:13 +00:00
Nan Zhang
0b23748128 Merge "Add Turbine as part of java build toolchain in Make." 2017-08-31 18:01:43 +00:00
Andreas Gampe
259b08f555 Merge "Build: Change SANITIZE_LITE install settings" am: 6942dfb65e am: 9356ad9d5d
am: a3985ada91

Change-Id: I997dce795b696893c6464a79aeeaf40a30b8efb6
2017-08-31 17:34:09 +00:00
Andreas Gampe
9356ad9d5d Merge "Build: Change SANITIZE_LITE install settings"
am: 6942dfb65e

Change-Id: I81c572ca5866e3ca07d26f948bb44d8c9deabe74
2017-08-31 17:28:36 +00:00
Andreas Gampe
4ed21d10e8 Build: Change SANITIZE_LITE install settings
Under SANITIZE_LITE, the default app_process is not instrumented.
Embedding sanitized libraries into APKs will lead to crashing apps.
So move second-stage APKs to /data/asan.

The tradeoff is that for now we won't run these sanitized binaries.
Adding support for that is future work.

Also do not do a rebuild of the boot image. This would invalidate
the first-stage results. Note that this is technically dangerous,
as stack overflow guard sizes will not be adapted for ASAN runs.
However, this is a general incompatibility.

Also do not rebuild system_other. Apps are not rebuilt, so it will
create an empty image.

(cherry picked from commit 481660ef34)

Bug: 36458146
Test: m && m SANITIZE_TARGET=address SANITIZE_LITE=true
Merged-In: I3898bc53cad264529f126e6bf0af9c6ca1736877
Change-Id: I3898bc53cad264529f126e6bf0af9c6ca1736877
2017-08-31 08:56:18 -07:00
Bowgo Tsai
02a84c762d Merge "Copy adbd from system/bin to recovery/root/sbin"
am: 6803a3444a

Change-Id: Id28c6965e05ca828cc736621ddcfa14606753644
2017-08-31 06:30:35 +00:00
Treehugger Robot
6803a3444a Merge "Copy adbd from system/bin to recovery/root/sbin" 2017-08-31 06:22:16 +00:00
Treehugger Robot
b9710fb602 Merge "master is now P" 2017-08-31 01:14:38 +00:00
bohu
7b5e1abacb emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-30 17:13:47 -07:00
bohu
b7e2fabe38 emualtor: keep libopenjdkjvmti*.so on sdk images
BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
Merged-In: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
2017-08-30 17:13:42 -07:00
Yahan Zhou
3cf7441dbe Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I75b9f0de17fece3dec5ae1662400808af321bd4d
Merged-In: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-08-30 17:13:20 -07:00
Nan Zhang
0739155c86 Add Turbine as part of java build toolchain in Make.
1. Bundle static_java_header_libs during turbine-classes.jar if
necessary. This can be improved if we have the ability to merge jars on
the fly.

2. Copy sdk/stubs-classes.jar to sdk/stubs-classes-header.jar, and Use
.KATI_RESTAT to cut un-necessary targets rebuilt.

3. Copy prebuilt-classes.jar to prebuilt-classes-header.jar since
Turbine doesn't apply to prebuilt.

4. Run jarjar after Turbine compilation, otherwise downstream targets
won't find corresponding symbols.

5. Change classes.jar in -classpath used in Desugar to
classes-header.jar.

6. Change legacy-libs in Proguard from classes.jar to
classes-header.jar.

7. Add .KATI_RESTAT for turbine-classes.jar, and remove IJAR.

8.boot.art is re-generated during the incremental rebuild since
javalib.jar got re-generated. Then boot.art re-triggered lots of
downstream targets to be rebuilt. So we add .KATI_RESTAT for javalib.jar
to prevent downstream to be rebuilt. The ziptime & commit-change-to-toc
operation for javalib.jar(small) didn't bring too much overhead when we build
from clean state.

Next step: specify static_java_header_libs in -classpath, and merge jars
at the end.

touch frameworks/base/core/java/com/google/android/util/Procedure.java &&
time m
time: 1m58s (794 -> 49 targets)

m clean && time m java
time: 9m34s

Bug: b/64308460

Test: m clean && m checkbuild

Change-Id: Iefcc234405b9f461b6882c06bba15e21fa783d28
2017-08-30 16:01:39 -07:00
Steven Moreland
5bce7f201e Update compatibility matrix logic.
Use c_m.<level>.xml for matrices which correspond
to released API levels.

Test: manual
Test: build system complains when files are missing
Bug: 63603463
Change-Id: I16bcab9a7548876ec2bedf9c5d70a126ac50b8d5
2017-08-30 14:48:08 -07:00