Commit Graph

21964 Commits

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

Change-Id: I3e702b9adb0dd18dd256682518a4a5debbcaa9aa
2019-10-28 21:28:30 -07:00
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 15b5ad2d05 Merge "Build rules use private vars" 2019-10-29 02:21:01 +00:00
Yifan Hong 5946473c36 Merge "Include system_other.img in super.img by default" am: 0fdd73b18f am: dd8414a5ae
am: 8899c7ce3a

Change-Id: Idde143bae80b63aa6e48a75b3254e711768c63a0
2019-10-28 18:29:25 -07: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 0fdd73b18f Merge "Include system_other.img in super.img by default" 2019-10-29 00:56:21 +00:00
Ryan Prichard dcef27c2ad Merge "Stop linking libdl.a into static bins" am: fe43a3f2cb am: e22800852f
am: 0ba1b3f2e8

Change-Id: If381b398740c9aef72072056913b23c348fd6fdd
2019-10-28 13:57:32 -07: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 fe43a3f2cb Merge "Stop linking libdl.a into static bins" 2019-10-28 20:14:37 +00:00
Roland Levillain 0c486ca724 Merge "Revert "Remove Core Library JARs from `/system/framework`."" am: 5ec356acff am: 8e3afe7ca4
am: c895f20422

Change-Id: Iaeefdb61df3e33e56030a0a9e45068630e337fe7
2019-10-28 11:14:38 -07: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 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 8eb3787d71 Merge "Replace framework.jar with framework-minus-apex.jar" am: 21403dc2df am: 252f3bfbfb
am: 01fcd076fd

Change-Id: Id8a99e59e44b47ba2ee6522452d6e3a5295e07a7
2019-10-28 05:25:49 -07: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
Pete Gillin dbad8e5a2f Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." am: a466a58bbb am: 94870cc287
am: d2856b841a

Change-Id: I51db7b562d37b0d5e11c63ae470ca1eb90f807c1
2019-10-28 05:18:54 -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
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
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
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
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
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 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
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
Nicolas Geoffray f7f7f8cdd9 Merge "Remove support for stripping dex." am: 8567331a4f
am: fbdf5ef4df

Change-Id: I494e80fc9bdb79c8e68163804d0648583c5e0df7
2019-10-22 03:28:01 -07: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 fa1a9a2045 Merge "Delete VINTF files from target files package." am: 371e3c3b6c
am: 9d97d8eb67

Change-Id: Ic254cd7dc348789f339c6dd031b375837b1ae85a
2019-10-21 11:57:18 -07: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 8d0419cb6c Merge "Allow files generated by droidstubs to be copied in the SDK" am: aa1c6bb4b3
am: fac0ac32f9

Change-Id: Ib3c7ab392e4064786ca4832a27650b5710b6c96c
2019-10-21 03:00:31 -07: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 b557270fde Merge "Generalize vts config module for other Suites" am: ef582f1432
am: 41c41c0215

Change-Id: I9832dc14a39df768b028d7856779395ead5a7c3b
2019-10-18 15:54:51 -07: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
Inseob Kim 1a848ab39a Merge changes from topic "fix_treble_sysprop_neverallow" am: 8de0013551
am: 44090a3b54

Change-Id: I5e9af10ae17a0399f827cc6efe2b51a72d702ad0
2019-10-17 20:09:47 -07:00