Commit graph

56556 commits

Author SHA1 Message Date
Xin Li
3b1de7ebf1 [automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: f699737282 -s ours
am skip reason: change_id If1543d20656d99205debad84e169ac14c53b6e10 with SHA1 e3a278b5c6 is in history

Change-Id: I648ba1239f86057ba95ea2bd4f4ed3ffd7d7b7ef
2019-10-26 22:32:13 -07:00
Xin Li
f699737282 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Jooyung Han
da827a0fd6 Merge "Use soong-generated vndk.libraries.txt" am: 6b1be377a5 am: 4ca744212c
am: 75630cb12d

Change-Id: Ifd20e5f0499d58bc1744fd2bbb52d7bbbdbfff2f
2019-10-25 19:28:40 -07:00
Jooyung Han
75630cb12d Merge "Use soong-generated vndk.libraries.txt" am: 6b1be377a5
am: 4ca744212c

Change-Id: I723ec3777f719100880d9f135740ab1def90b986
2019-10-25 19:22:20 -07:00
Jooyung Han
4ca744212c Merge "Use soong-generated vndk.libraries.txt"
am: 6b1be377a5

Change-Id: I7472da62ec2a98a482a6bcba77d0dd7e19eefa0e
2019-10-25 19:15:51 -07: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
82d8994dad Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" am: df518833b4 am: 016181ab3f
am: bf188fdf31

Change-Id: I19c75c0da2fc4c0cd910411ca5ecd3f527335a57
2019-10-25 01:49:47 -07:00
Jooyung Han
bf188fdf31 Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" am: df518833b4
am: 016181ab3f

Change-Id: Ia3f539a524e1ad935491e099c5f062308d812c1e
2019-10-25 01:43:05 -07:00
Jooyung Han
016181ab3f Merge "Revert "Revert "install VNDK APEX instead of VNDK libs"""
am: df518833b4

Change-Id: I861ec1e245fb5caf4a9d497d2ee117e5c3a8d7c6
2019-10-25 01:30:29 -07:00
Jooyung Han
df518833b4 Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" 2019-10-25 08:21:13 +00:00
Evgenii Stepanov
70ec542342 Revert "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds."
am: 69b3f82249

Change-Id: I7559f3c663e2e337b79dbee720ab63c3fa87141a
2019-10-24 21:32:24 -07:00
Evgenii Stepanov
69b3f82249 Revert "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds."
This reverts commit edfd1ae712.

Reason for revert: breaks sepolicy_freeze_test

Change-Id: Idf15bfd4bf74cd0ba0ae42c4c95c4afa0c94be54
2019-10-25 03:57:56 +00:00
Evgenii Stepanov
b38b65a41f [automerger skipped] Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
am: edfd1ae712 -s ours
am skip reason: change_id If2eb99dee93f0652cada5cb2e02fda963d00a7eb with SHA1 eb3ade924b is in history

Change-Id: Iabe0ef848539f33821af2294eac8d6d353c87429
2019-10-24 20:09:54 -07: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
a3a9dec14c Merge "Use adbd_system_binaries to track adbd's dependencies." am: 3322f6ec35 am: e3a278b5c6
am: c63162c0e4

Change-Id: I3688c887932334867f2acf1a693722fa621cadd0
2019-10-24 14:45:09 -07:00
Josh Gao
c63162c0e4 Merge "Use adbd_system_binaries to track adbd's dependencies." am: 3322f6ec35
am: e3a278b5c6

Change-Id: Ibe95c4799847ac2a7ed2e24957a1553b5b094117
2019-10-24 14:39:13 -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
Evgenii Stepanov
edfd1ae712 Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
This will let us quickly check the system image build type,
and modify *.rc behavior based on that.

Bug: 142430632
Bug: 142681453
Test: adb shell getprop ro.sanitize.hwaddress in hwasan build

Change-Id: If2eb99dee93f0652cada5cb2e02fda963d00a7eb
Merged-In: If2eb99dee93f0652cada5cb2e02fda963d00a7eb
(cherry picked from commit eb3ade924b)
2019-10-24 21:03:02 +00: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
7ef7566f27 Merge "VNDK-core += health@2.1" am: 0d07c944ae am: fd914c0232
am: 8d6d24632e

Change-Id: Idbc1f77ff2f59942cbbf51e4087a7157bf9070fc
2019-10-23 18:44:13 -07:00
Yifan Hong
8d6d24632e Merge "VNDK-core += health@2.1" am: 0d07c944ae
am: fd914c0232

Change-Id: I006e005c0f2e54c62a12a5a8021a6515f9462b13
2019-10-23 18:37:12 -07: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
eaaa3e2743 Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY" am: 9126041689 am: 12e476cb93
am: 47f3fa20a7

Change-Id: Iaca0ff350401b33e99f800555876f979fc051b66
2019-10-23 16:30:28 -07:00
Lubo Hristov
c8e28a77c2 Merge "Bump SPL to 2019-12-05" into qt-qpr1-dev
am: 7c27fd1e00

Change-Id: I9991042e7666255221db6324ef2771e9a442827b
2019-10-23 16:22:55 -07:00
Steven Moreland
47f3fa20a7 Merge "host_init_verifier: no HIDL_INTERFACE_HIERARCHY" am: 9126041689
am: 12e476cb93

Change-Id: Iddc1306a4cfb57618259b5dd4e2186b7cc58e711
2019-10-23 16:18:24 -07: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
Lubo Hristov
7c27fd1e00 Merge "Bump SPL to 2019-12-05" into qt-qpr1-dev 2019-10-23 23:02:17 +00:00
Winson Chiu
38a07e17ca Merge "Revert "VNDK library list uses installed name"" am: 82e8d28d03 am: 30427892d7
am: d72b3289a5

Change-Id: I695bb4356947e5b1fe576ac7de692736b66a11d4
2019-10-23 15:59:18 -07:00
Winson Chiu
d72b3289a5 Merge "Revert "VNDK library list uses installed name"" am: 82e8d28d03
am: 30427892d7

Change-Id: I9a0beadf85ccf4fdf615a7e587c21cd2568d80d5
2019-10-23 15:39:53 -07: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
560b81a8b6 Merge "VNDK library list uses installed name" am: 885cf6b565 am: 4c0eae4f3f
am: 4d797c1aaa

Change-Id: Ic585e628fda8b83cc0313a70147e6924b1618059
2019-10-23 12:20:57 -07:00
Yo Chiang
4d797c1aaa Merge "VNDK library list uses installed name" am: 885cf6b565
am: 4c0eae4f3f

Change-Id: I8a5b25f29618924830e9a3b855ef3a9489442731
2019-10-23 12:07:16 -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
53f94ef1e3 Merge "Remove Core Library JARs from /system/framework." am: 047f2fd43e am: e517577a45
am: c0bcc522fa

Change-Id: I721bfc796e764244ae47627ed48c2e91a2803baa
2019-10-22 11:07:53 -07:00
Roland Levillain
c0bcc522fa Merge "Remove Core Library JARs from /system/framework." am: 047f2fd43e
am: e517577a45

Change-Id: Ib054fdf555f14dc64eaa430bc2544ab991ed2bdb
2019-10-22 10:56:40 -07: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