Commit Graph

55942 Commits

Author SHA1 Message Date
Treehugger Robot 85808a8089 Merge "Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""" 2019-10-30 04:29:37 +00:00
Xiangyu/Malcolm Chen c76498a53d Merge "Adding IRadio1.5 definition." 2019-10-29 22:22:38 +00:00
Treehugger Robot e8d9df122a Merge "Add zygote init script to mainline_system.mk" 2019-10-29 06:32:44 +00:00
Treehugger Robot 016f3027ed Merge "CleanSpec for symlinks to VNKD APEX" 2019-10-29 05:17:37 +00:00
Alistair Delva 15b5ad2d05 Merge "Build rules use private vars" 2019-10-29 02:21:01 +00:00
Jooyung Han 60c493f9c7 CleanSpec for symlinks to VNKD APEX
VNDK APEX was reverted.

Bug: 143374795
Test: m
Change-Id: I09fb28b72765dbe5a781001d8ddf53644fc45154
2019-10-29 11:19:06 +09:00
Yifan Hong 0fdd73b18f Merge "Include system_other.img in super.img by default" 2019-10-29 00:56:21 +00:00
Jooyung Han 93bdc3e734 Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""
This reverts commit ec8769762f.

Reason for revert:  Fix b/143374795

Change-Id: I7a9a06cb01e3cac0d15b352da76b6b8e9b45eb63
2019-10-28 21:07:21 +00:00
Ryan Prichard fe43a3f2cb Merge "Stop linking libdl.a into static bins" 2019-10-28 20:14:37 +00:00
Roland Levillain 5ec356acff Merge "Revert "Remove Core Library JARs from `/system/framework`."" 2019-10-28 17:48:23 +00:00
Greg Kaiser 35815917ba Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" 2019-10-28 17:12:33 +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
Justin Yun c0b883fe77 Add zygote init script to mainline_system.mk
We may add all possible scripts to "root" to clean up the whitelists
of mainline devices.
One of the zygote init scripts is selected by "ro.zygote" property.

Bug: 143121605
Test: build test for all device targets
Change-Id: I4435f1c48a306c3a8d42522ed780d405a32780b4
2019-10-28 14:31:24 +09:00
Jooyung Han ec8769762f Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""
This reverts commit 6851a27604.

Reason for revert: b/143374795

Change-Id: Iff04cb2a500b4d624abeec4dbc5dcfb5a6e03397
2019-10-28 05:09:13 +00:00
Xin Li f699737282 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Treehugger Robot 6b1be377a5 Merge "Use soong-generated vndk.libraries.txt" 2019-10-26 01:52:39 +00:00
Malcolm Chen e12c3bb24f Adding IRadio1.5 definition.
Bug: 141995149
Test: build
Change-Id: I46ab1f095c661d6241ccb8afe907b9d0e78a2786
Merged-In: I46ab1f095c661d6241ccb8afe907b9d0e78a2786
2019-10-25 16:08:05 -07:00
Xin Li a76973dcbf Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: Iffa21efaa08e8b067dfa2857bd2951208c756395
Merged-In: If1543d20656d99205debad84e169ac14c53b6e10
2019-10-25 10:27:44 -07: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
Jooyung Han df518833b4 Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" 2019-10-25 08:21:13 +00: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
Josh Gao e3a278b5c6 Merge "Use adbd_system_binaries to track adbd's dependencies."
am: 3322f6ec35

Change-Id: If1543d20656d99205debad84e169ac14c53b6e10
2019-10-24 14:31:13 -07:00
Josh Gao 3322f6ec35 Merge "Use adbd_system_binaries to track adbd's dependencies." 2019-10-24 20:29:25 +00:00
Jooyung Han a0158d8327 Use soong-generated vndk.libraries.txt
check-vndk-list target should use 'filename's not 'modulename's.
But retrieving(or calculation) of filename from modulename doesn't work
when target module is not installed. That's why builds of some targets
fail given that libprotobuf-cpp-full's name is changed.

Now soong generates vndk.libraries.txt with filenames of VNDK libs.

And, check-vndk-list target is disabled now for targets with no vndk
libs. (BOARD_VNDK_VERSION is not set)

Bug: 142963962
Bug: 141019581
Test: m check-vndk-list
Test: lunch qemu_trusty_arm64-userdebug; m check-vndk-list (no check)
Change-Id: I680deb1a7af37c32a9e6932d52e8d87e5a3534b9
2019-10-25 02:15:48 +09: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
Yifan Hong fd914c0232 Merge "VNDK-core += health@2.1"
am: 0d07c944ae

Change-Id: I50f5a9f8414a7d946c27c07c2a0b5989f3b7877c
2019-10-23 18:30:11 -07:00
Yifan Hong 0d07c944ae Merge "VNDK-core += health@2.1" 2019-10-24 01:03:09 +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
Winson Chiu 30427892d7 Merge "Revert "VNDK library list uses installed name""
am: 82e8d28d03

Change-Id: I67478e03cd823106788f4ba1050cc42794edded2
2019-10-23 15:20:43 -07:00
Winson Chiu 82e8d28d03 Merge "Revert "VNDK library list uses installed name"" 2019-10-23 21:35:41 +00:00
Winson Chiu 3d5eba2be4 Revert "VNDK library list uses installed name"
This reverts commit b808592783.

Reason for revert: potentially broke build b/143233626

Change-Id: I1458cb687923833010f3de1277092f8ead744ea3
2019-10-23 21:24:40 +00:00
Josh Gao 56db7393ce Use adbd_system_binaries to track adbd's dependencies.
required doesn't propagate from apexes, so we need a separate phony
target to track adbd's dependenecies.

Test: m
Change-Id: Ic9fd19570987c5c3d96d3a35f2d3e2c7ea4642d9
2019-10-23 13:27:48 -07:00
Yo Chiang 4c0eae4f3f Merge "VNDK library list uses installed name"
am: 885cf6b565

Change-Id: If7b4a28183348535e8166193f3c990dc3b4d7d43
2019-10-23 11:46:53 -07:00
Treehugger Robot 885cf6b565 Merge "VNDK library list uses installed name" 2019-10-23 18:02:00 +00: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