Commit graph

56214 commits

Author SHA1 Message Date
Alistair Delva
c329243515 Merge "Build rules use private vars" am: 15b5ad2d05
am: 4e6e02ac7b

Change-Id: I9f6ae636be2981fa50bf8d394d664832307f36d8
2019-10-28 21:21:26 -07:00
Alistair Delva
4e6e02ac7b Merge "Build rules use private vars"
am: 15b5ad2d05

Change-Id: I0ad9cefbfb0d975c6dae9c5a5fbbe1dcbc014785
2019-10-28 21:14:25 -07:00
Alistair Delva
15b5ad2d05 Merge "Build rules use private vars" 2019-10-29 02:21:01 +00:00
Yifan Hong
8899c7ce3a Merge "Include system_other.img in super.img by default" am: 0fdd73b18f
am: dd8414a5ae

Change-Id: Ie202169775e3bcc96846c3e7ee0173bbb2076f91
2019-10-28 18:23:22 -07:00
Yifan Hong
dd8414a5ae Merge "Include system_other.img in super.img by default"
am: 0fdd73b18f

Change-Id: I72a10d0a9eac2375f4e9e2fc4b5bac0f629662ff
2019-10-28 18:16:49 -07:00
Yifan Hong
0fdd73b18f Merge "Include system_other.img in super.img by default" 2019-10-29 00:56:21 +00:00
Ryan Prichard
0ba1b3f2e8 Merge "Stop linking libdl.a into static bins" am: fe43a3f2cb
am: e22800852f

Change-Id: I13d4ffc9677d1befc80a1388eeb40d0876e5c6a3
2019-10-28 13:47:13 -07:00
Ryan Prichard
e22800852f Merge "Stop linking libdl.a into static bins"
am: fe43a3f2cb

Change-Id: I9209b793f37ac2a16294a50d2d83a0aa72134d28
2019-10-28 13:35:54 -07:00
Ryan Prichard
fe43a3f2cb Merge "Stop linking libdl.a into static bins" 2019-10-28 20:14:37 +00:00
Roland Levillain
c895f20422 Merge "Revert "Remove Core Library JARs from /system/framework."" am: 5ec356acff
am: 8e3afe7ca4

Change-Id: Iea0fbe32dad214044bae722bb85a82bc472c961f
2019-10-28 11:07:36 -07:00
Roland Levillain
8e3afe7ca4 Merge "Revert "Remove Core Library JARs from /system/framework.""
am: 5ec356acff

Change-Id: Ia05ace1c23ac8bea2453658948db1e454e323c7a
2019-10-28 10:56:18 -07:00
Roland Levillain
5ec356acff Merge "Revert "Remove Core Library JARs from /system/framework."" 2019-10-28 17:48:23 +00:00
Greg Kaiser
dbaee05a78 Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" am: 35815917ba
am: c443c0b348

Change-Id: I8a6328744d4839041a07b1c3db56c564e860aae4
2019-10-28 10:26:00 -07:00
Greg Kaiser
c443c0b348 Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""
am: 35815917ba

Change-Id: I1a843901f0c97d89f37b90a503c908ee6fe51634
2019-10-28 10:20:01 -07: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
Jiyong Park
01fcd076fd Merge "Replace framework.jar with framework-minus-apex.jar" am: 21403dc2df
am: 252f3bfbfb

Change-Id: I6bccea8011b3248bbfefc8b36d5d67f53b4a7822
2019-10-28 05:19:51 -07:00
Jiyong Park
252f3bfbfb Merge "Replace framework.jar with framework-minus-apex.jar"
am: 21403dc2df

Change-Id: Ifebf2f1d380f48aaa5310e9cb14bc9efe85ac640
2019-10-28 05:13:51 -07:00
Pete Gillin
d2856b841a Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." am: a466a58bbb
am: 94870cc287

Change-Id: Iacf52137ad6bd483d4939bcf593fef7e868e7812
2019-10-28 05:12:51 -07:00
Pete Gillin
94870cc287 Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
am: a466a58bbb

Change-Id: Ic99aea6edc4390378e4bce9d098e42438dee70bd
2019-10-28 05:06:35 -07: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
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
9bacb3ab5e [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: f699737282 -s ours
am: 3b1de7ebf1 -s ours
am skip reason: change_id If1543d20656d99205debad84e169ac14c53b6e10 with SHA1 e3a278b5c6 is in history

Change-Id: I33e56b42bb87caeb31720bf367f1050e85fff137
2019-10-26 22:52:09 -07:00
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
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
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
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
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
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
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
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
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
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