Commit Graph

22292 Commits

Author SHA1 Message Date
android-build-team Robot
911d5e061c Version bump to QQ1A.191205.009 [core/build_id.mk]
Change-Id: I60b4e9893d1ef935dcfe8a04dc068541331d58a6
2019-11-01 16:33:07 +00:00
Andrei-Valentin Onea
57e2d5d502 Merge "Revert "Move partition size checks to python script""
am: 15e75e8807

Change-Id: Ib20566af43adc53146fe4c19f7773bc007d62e07
2019-11-01 08:51:16 -07:00
Andrei-Valentin Onea
15e75e8807 Merge "Revert "Move partition size checks to python script"" 2019-11-01 15:36:10 +00:00
Raff Tsai
0141e45b96 Revert "Move partition size checks to python script"
This reverts commit a4906cd306.

Reason for revert: b/143734706

Change-Id: I905bd9c0bfcbd123c8f9e78986bfcb5600a9eca9
2019-11-01 05:36:20 +00:00
Yifan Hong
9fc6b8d8c4 Merge "Move partition size checks to python script"
am: 8244f27722

Change-Id: I7e9f05ff4c25d70699ae79f5cdfb19597a81d722
2019-10-31 19:12:10 -07:00
Yifan Hong
8244f27722 Merge "Move partition size checks to python script" 2019-11-01 01:52:11 +00:00
Roland Levillain
ba88c3be5c Merge "Implement APEX JAR (Java library) absence checks for Core Libraries."
am: 374213db0d

Change-Id: I690908bea6727c8f26d76105e53740a4e6488f59
2019-10-31 12:22:29 -07:00
TreeHugger Robot
81e3eb8597 Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master 2019-10-31 18:38:43 +00:00
Yifan Hong
a4906cd306 Move partition size checks to python script
Easier to read and modify its logic.

Test: builds
Test: test_check_partition_sizes
Test: atest releasetools_test
Test: atest releasetools_py3_test
Change-Id: I73204664b64a0bcee7375fa6fca46758d5a2bb72
2019-10-31 11:22:20 -07:00
Roland Levillain
b353eda0c0 Implement APEX JAR (Java library) absence checks for Core Libraries.
Refactor existing native library checks to share common logics.

Test: Check that `m installclean && m systemimage` succeeds
Test: Check that `m installclean && m libart && m systemimage` fails
Test: Check that `m installclean && m core-oj && m systemimage` fails
Test: Check that `m installclean && m conscrypt && m systemimage` fails
Test: Check that `m installclean && m libart core-oj conscrypt && m systemimage` fails
Test: Check that
        `export OVERRIDE_TARGET_FLATTEN_APEX=true \
         && m installclean \
         && m systemimage`
      succeeds
Bug: 142944799
Bug: 128708192
Bug: 113374338
Change-Id: I703a837c6bb138af73eeb95fc08e1a87af2d8ad7
2019-10-31 16:09:02 +00:00
Xin Li
5cf7c45d0c DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I635cde495c56988d324aeab6a278f4abfdea16d8
2019-10-30 11:46:29 -07:00
Roland Levillain
c7c4a766f0 Reland "Remove Core Library JARs from /system/framework."
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.

This change no longer breaks coverage builds, as module
`jacocoagent` has been removed from `TARGET_CORE_JARS` in CL
https://android-review.googlesource.com/c/platform/build/+/1151464.

This reverts commit 7c39368927.

Test: Device boot test
Test: Check that:
        export EMMA_INSTRUMENT=true
        && unset EMMA_INSTRUMENT_STATIC
        && m installclean
        && m systemimage
      generates a system image that contains these files:
        /system/framework/apex-jacocoagent.vdex
        /system/framework/boot-jacocoagent.vdex
        /system/framework/jacocoagent.jar
        /system/framework/<arch>/apex-jacocoagent.art
        /system/framework/<arch>/apex-jacocoagent.oat
        /system/framework/<arch>/apex-jacocoagent.vdex
        /system/framework/<arch>/boot-jacocoagent.art
        /system/framework/<arch>/boot-jacocoagent.oat
        /system/framework/<arch>/boot-jacocoagent.vdex
Test: Run test ATP test avd/avd_boot_health_check on build target
      cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991
Change-Id: Ifdb2331c5dcb992adbfd6c5a3983d8b9b13d16b2
2019-10-30 16:25:19 +00:00
Anton Hansson
cca8cdb993 Ensure current product use PRODUCT_* vars directly
Disallow use of the long-form PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_*
after the short-form has been assigned, to ensure modifications are
made to the right variable.

Macros that need to work with multiple products get a convenience
macro that is redefined at the right moment.

Test: compare_target_files
Test: build_test
Change-Id: Ib0e57b1bc51b1f308296a150b9b7590a0bb5c313
2019-10-30 14:29:42 +00:00
Roland Levillain
10954b52ee Merge "Remove module jacocoagent from TARGET_CORE_JARS." 2019-10-30 11:08:12 +00:00
android-build-team Robot
51edc9cb55 Version bump to QQ1A.191205.008 [core/build_id.mk]
Change-Id: I42ad4b0961b3af40f89ee8237e3bb1b7f658b1fc
2019-10-29 21:45:20 +00:00
Roland Levillain
fe67f14906 Remove module jacocoagent from TARGET_CORE_JARS.
Before this change, `jacocoagent` was conditionally added to
`TARGET_CORE_JARS`. However, this module is not really part of the
Android Core Libraries (also, we plan to remove `TARGET_CORE_JARS`
from `PRODUCT_PACKAGES`). Remove it from `TARGET_CORE_JARS` while
keeping it in `PRODUCT_PACKAGES` and `PRODUCT_BOOT_JARS`, to keep
having it installed and being part of the boot class path on
devices (under the same conditions).

Test: Check that:
        export EMMA_INSTRUMENT=true
        && unset EMMA_INSTRUMENT_STATIC
        && m installclean
        && m systemimage
      generates a system image that contains these files:
        /system/framework/apex-jacocoagent.vdex
        /system/framework/boot-jacocoagent.vdex
        /system/framework/jacocoagent.jar
        /system/framework/<arch>/apex-jacocoagent.art
        /system/framework/<arch>/apex-jacocoagent.oat
        /system/framework/<arch>/apex-jacocoagent.vdex
        /system/framework/<arch>/boot-jacocoagent.art
        /system/framework/<arch>/boot-jacocoagent.oat
        /system/framework/<arch>/boot-jacocoagent.vdex
Test: Run test ATP test avd/avd_boot_health_check on build target
      cf_x86_phone-userdebug_coverage
Bug: 143304991
Bug: 142944799

Change-Id: Ib047a394342aeffbfec26ebc756159f145d6523e
2019-10-29 17:45:04 +00:00
Alistair Delva
15b5ad2d05 Merge "Build rules use private vars" 2019-10-29 02:21:01 +00:00
Yifan Hong
0fdd73b18f Merge "Include system_other.img in super.img by default" 2019-10-29 00:56:21 +00:00
Ryan Prichard
fe43a3f2cb Merge "Stop linking libdl.a into static bins" 2019-10-28 20:14:37 +00:00
Roland Levillain
7c39368927 Revert "Remove Core Library JARs from /system/framework."
This reverts commit 3ec9ff6b72.

Reason for revert: This change breaks coverage builds (b/143304991)

Change-Id: Ia1a41ea75d1539efeb33b7cdea84516e402b6e00
Test: Device boot test
Test: Check that:
        export EMMA_INSTRUMENT=true
        && unset EMMA_INSTRUMENT_STATIC
        && m installclean
        && m systemimage
      generates a system image that contains these files:
        /system/framework/apex-jacocoagent.vdex
        /system/framework/boot-jacocoagent.vdex
        /system/framework/jacocoagent.jar
        /system/framework/<arch>/apex-jacocoagent.art
        /system/framework/<arch>/apex-jacocoagent.oat
        /system/framework/<arch>/apex-jacocoagent.vdex
        /system/framework/<arch>/boot-jacocoagent.art
        /system/framework/<arch>/boot-jacocoagent.oat
        /system/framework/<arch>/boot-jacocoagent.vdex
Test: Test: Run test ATP test avd/avd_boot_health_check on build target
      cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991
2019-10-28 15:00:31 +00:00
Treehugger Robot
21403dc2df Merge "Replace framework.jar with framework-minus-apex.jar" 2019-10-28 11:40:09 +00:00
Pete Gillin
a466a58bbb Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." 2019-10-28 10:28:19 +00:00
Jiyong Park
44d357e1ff Replace framework.jar with framework-minus-apex.jar
Bug: 139391334
Test: m, device is bootable
Exempt-From-Owner-Approval: Approved internally
Merged-In: I281f841c164a4813ed4c436fb84680f5ade1ee1d
(cherry picked from commit 219d4ac2b2)
Change-Id: I281f841c164a4813ed4c436fb84680f5ade1ee1d
2019-10-28 09:55:33 +00:00
Pete Gillin
6a88bd49bc Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.
Prior to this change, setting that to "false" turned the default Java
language level back to 8. This change removes that option.

Also remove the unused make variable USE_OPENJDK9.

Bug: 115604102
Test: m java droid docs tests cts
Change-Id: I040cf83a2457227ffbcd1c62649e33b98c0c66f7
2019-10-25 16:55:54 +01:00
Yo Chiang
5eac77c735 Build rules use private vars
Create PRIVATE_TOOLS_PREFIX for VNDK build rules. So that the value of
$(my_prefix) is well-preserved.

Bug: 142350531
Bug: 141971626
Test: lunch aosp_cf_x86_go_phone-userdebug ; m nothing
Change-Id: I06f16708c7165cb909f0031182ffb96a462d6000
2019-10-25 22:14:59 +08:00
Ryan Prichard
acf8b0ff00 Stop linking libdl.a into static bins
libdl.a has a no-op dlopen, which breaks static libraries that need a real
dlopen. Instead of automatically linking libdl.a into static executables,
make it optional.

Until recently, the libunwind_llvm.a unwinder, used on arm32, needed the
no-op dladdr, but it's now built using -D_LIBUNWIND_USE_DLADDR=0.

The HWASan run-time uses dlsym and dladdr, so add a libdl dependency for
HWASan-built static binaries. We could also remove the dependency from
libclang_rt.hwasan_static-*.a, but this is also easy to do.

Bug: http://b/141485154
Test: bionic unit tests, device boots, verify that static and dynamic
   executables can throw/catch an exception
Test: verify that a static executable using dlopen doesn't link (unless it
   adds an explicit dependency on libdl)

Change-Id: Id26741f79dca50256a2dc23453af3026a6c88dca
2019-10-24 18:15:05 -07:00
android-build-team Robot
a62ba02133 Version bump to QQ1A.191205.007 [core/build_id.mk]
Change-Id: Ia315ea4c4351aebdad65b352dedafab51c62d782
2019-10-24 22:37:57 +00:00
changho.shin
a8f9f117cf Include system_other.img in super.img by default
Currently, only dist build makes super.img with system_other.
Let build system include system_other in super image by default.

Test: m -j & check built super.img
Bug: 142669000

Change-Id: I00a8815b30fa6fb8c62e204fdc35e046071bd401
2019-10-24 06:57:58 +00:00
Steven Moreland
12e476cb93 Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY"
am: 9126041689

Change-Id: If3597954a216928add218c85a5934550f7e71e95
2019-10-23 16:13:58 -07:00
Steven Moreland
9126041689 Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY" 2019-10-23 23:07:30 +00:00
Inseob Kim
65c91ff15a Fix and generate vndk snapshot entirely in Soong
- VNDK snapshot now respects stem and suffix.
- ld.config.txt is removed from snapshot as linkerconfig has become default.
- Soong builds entire snapshot, and make just calls dist-for-goals.

Bug: 142589718
Test: build and install snapshot
Test: development/vndk/snapshot/update.py with past version of snapshot
Change-Id: Ib99f1006d3553b1871b86ab168b1706fe47e1afb
2019-10-23 15:54:08 +09:00
Roland Levillain
e517577a45 Merge "Remove Core Library JARs from /system/framework."
am: 047f2fd43e

Change-Id: Ic25531c16a71452e659776765185adf8feac5eac
2019-10-22 10:51:10 -07:00
Roland Levillain
047f2fd43e Merge "Remove Core Library JARs from /system/framework." 2019-10-22 17:32:21 +00:00
Roland Levillain
3ec9ff6b72 Remove Core Library JARs from /system/framework.
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.

(cherry picked from commit d4f09f7752)

Test: Device boot test
Bug: 142944799
Change-Id: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
Merged-In: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
2019-10-22 16:42:53 +00:00
Nicolas Geoffray
fbdf5ef4df Merge "Remove support for stripping dex."
am: 8567331a4f

Change-Id: I97da8f46547c2cbca103fe7c9301a6086a7017c1
2019-10-22 03:21:28 -07:00
Nicolas Geoffray
8567331a4f Merge "Remove support for stripping dex." 2019-10-22 09:48:06 +00:00
Yifan Hong
9d97d8eb67 Merge "Delete VINTF files from target files package."
am: 371e3c3b6c

Change-Id: Ieb99a77a1fd887a950122d54f504946dcaff3324
2019-10-21 11:51:19 -07:00
Yifan Hong
371e3c3b6c Merge "Delete VINTF files from target files package." 2019-10-21 18:29:04 +00:00
Jerome Gaillard
fac0ac32f9 Merge "Allow files generated by droidstubs to be copied in the SDK"
am: aa1c6bb4b3

Change-Id: Iee4b8f2dfcfea343f9c696e230a092d059a344cb
2019-10-21 02:49:32 -07:00
Jerome Gaillard
aa1c6bb4b3 Merge "Allow files generated by droidstubs to be copied in the SDK" 2019-10-21 09:32:12 +00:00
Nicolas Geoffray
2ca0e49f61 Remove support for stripping dex.
Stripping is incompatible with ART module updatability.

Bug: 65154345
Bug: 138851227

Test: build and observe no change in output (stripping is not used by
default).

Change-Id: Ic2d9738ef393814c3af3cad116071f7b5938aa84
2019-10-21 09:36:45 +01:00
karenluo
41c41c0215 Merge "Generalize vts config module for other Suites"
am: ef582f1432

Change-Id: I55f9cbebdfdb35810d7e6b7e997443ea18704c6c
2019-10-18 15:46:47 -07:00
Treehugger Robot
ef582f1432 Merge "Generalize vts config module for other Suites" 2019-10-18 22:24:52 +00:00
karenluo
97d398f2de Generalize vts config module for other Suites
Removed the vts specific content from the wrapper file
android_vts_host_config.mk to make it more general to be used by other
suites, including C-Suite.

Test: make csuite
Change-Id: I6e79d8f6532376f94a87501683c260c8f3793ca7
Merged-In: I6e79d8f6532376f94a87501683c260c8f3793ca7
2019-10-18 18:28:23 +00:00
android-build-team Robot
be92d8e7c2 Version bump to QQ1A.191205.006 [core/build_id.mk]
Change-Id: Ie082173ea597393247c5a4230e825704ce3c18f8
2019-10-18 16:58:30 +00:00
Inseob Kim
44090a3b54 Merge changes from topic "fix_treble_sysprop_neverallow"
am: 8de0013551

Change-Id: Ie1c29edbdeca210697b9332beb52faade5431b5c
2019-10-17 20:03:20 -07:00
Treehugger Robot
8de0013551 Merge changes from topic "fix_treble_sysprop_neverallow"
* changes:
  Revert "Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW"
  Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full"
2019-10-18 02:39:48 +00:00
Yifan Hong
289b002427 Delete VINTF files from target files package.
This relands "Check VINTF compatibility at OTA generation time."
This reverts commit 948b259b52.

Reason for revert: blueline_mainline_mixed fixed now

Change-Id: Ib42f7183adb1e6f98692bdfbc73c2619227e646d
Fixes: 131425279
Test: builds
2019-10-18 00:07:23 +00:00
android-build-team Robot
25126f6277 Version bump to QQ1A.191205.005 [core/build_id.mk]
Change-Id: I5c187d08ca5841f0f3b362705565fa41c1a0f6d6
2019-10-17 20:29:42 +00:00
Pete Gillin
77a7d014b2 Merge "Enable Java language level 9 by default."
am: 3e25573c13

Change-Id: I6190f392ef5664fd738221b18b367d2255fb4737
2019-10-17 04:05:13 -07:00