Commit Graph

55972 Commits

Author SHA1 Message Date
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
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
Stephen Hines 3390c7de44 Merge "Guess source tree root from common file prefix."
am: aa94811b2a

Change-Id: I13e1f4a10964eed56a508c73280315d2498a8610
2019-10-18 11:17:23 -07:00
Stephen Hines aa94811b2a Merge "Guess source tree root from common file prefix." 2019-10-18 17:59:23 +00:00
Jooyung Han 6851a27604 Revert "Revert "install VNDK APEX instead of VNDK libs""
This reverts commit 376c613085.

Bug: 141451661
Test: m && boot (tested with cuttlefish)
2019-10-19 02:24:09 +09: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
Lev Proleev 49cd5afa8e Merge "Add NeuralNetworks HAL v1.3"
am: 44eea14988

Change-Id: Ie55f3f0614131030dad4c444956ef0a76813568e
2019-10-17 15:59:50 -07:00
Treehugger Robot 44eea14988 Merge "Add NeuralNetworks HAL v1.3" 2019-10-17 22:47:15 +00:00
Tianjie Xu 7a3304a0a4 Merge "Stop creating update_engine_payload_key"
am: 526b8563a5

Change-Id: I3417831ccd1e065f03062aad36388699ddf0136d
2019-10-17 14:09:39 -07:00
Tianjie Xu 526b8563a5 Merge "Stop creating update_engine_payload_key" 2019-10-17 20:59:51 +00:00
Mikhail Naganov 4c086e7be7 Merge "Add libaudiohal to mainline system image"
am: b410d98c0a

Change-Id: Ia274b609cd60db0c86c257e4967ef37cfa5d1c63
2019-10-17 13:39:48 -07:00
Treehugger Robot b410d98c0a Merge "Add libaudiohal to mainline system image" 2019-10-17 20:23:21 +00:00
Josh Gao 0ad32182a0 Merge "Move remount to PRODUCT_PACKAGES_DEBUG."
am: 7228fcf19a

Change-Id: I40733d1cf74d6fdb19c3b5abea214cef8726b6ec
2019-10-17 13:15:00 -07:00
Mikhail Naganov 4fc7e410fc Add libaudiohal to mainline system image
32-bit libaudiohal is used by 3rd party modules on the system
partition which get loaded by client apps. In the long term,
this dependency has to be eliminated, see b/142811260.

Bug: 141989952
Bug: 142811260
Test: vendor/google/build/build_test.bash
Merged-In: I41241922c7e48c5d8bf95363944932569cb20c0a
Change-Id: I41241922c7e48c5d8bf95363944932569cb20c0a
2019-10-17 12:36:42 -07:00
Josh Gao 7228fcf19a Merge "Move remount to PRODUCT_PACKAGES_DEBUG." 2019-10-17 19:14:26 +00:00
Jooyung Han 7701ecb0a4 Merge "Revert "install VNDK APEX instead of VNDK libs""
am: e925923af3

Change-Id: I6033c86172e87b1fabfc1a86967f7995f640694f
2019-10-17 05:07:58 -07:00
Treehugger Robot e925923af3 Merge "Revert "install VNDK APEX instead of VNDK libs"" 2019-10-17 11:50:47 +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