android/platform-build-soong.git
22 months agoRestore the test for bionic being in an APEX. master
Peter Collingbourne [Tue, 21 May 2019 23:06:09 +0000 (16:06 -0700)]
Restore the test for bionic being in an APEX.

This was removed in
https://android-review.googlesource.com/c/platform/build/soong/+/950885
because it appeared that bionic was always in an APEX, but apparently the
ART host tests have bionic outside of an APEX.

Test: art/test/testrunner/run_build_test_target.py -j50 art-linux-bionic-x64
Change-Id: I0b99462e8636da53c87f9250093689aaaf9ea695

22 months agoMerge "Add kotlin-stdlib-jdk8 when using Kotlin"
Colin Cross [Tue, 21 May 2019 18:11:59 +0000 (18:11 +0000)]
Merge "Add kotlin-stdlib-jdk8 when using Kotlin"

22 months agoMerge "Add an option to preserve symbols and debug_frame."
Christopher Ferris [Tue, 21 May 2019 18:09:08 +0000 (18:09 +0000)]
Merge "Add an option to preserve symbols and debug_frame."

22 months agoMerge "Avoid targeting Java 9 for targets with SDK version up to 29."
Pete Gillin [Tue, 21 May 2019 10:19:06 +0000 (10:19 +0000)]
Merge "Avoid targeting Java 9 for targets with SDK version up to 29."

22 months agoMerge "Teach soong not to duplicate the HWASAN runtime into each APEX."
Peter Collingbourne [Tue, 21 May 2019 02:29:46 +0000 (02:29 +0000)]
Merge "Teach soong not to duplicate the HWASAN runtime into each APEX."

22 months agoAvoid targeting Java 9 for targets with SDK version up to 29.
Pete Gillin [Mon, 20 May 2019 14:44:53 +0000 (15:44 +0100)]
Avoid targeting Java 9 for targets with SDK version up to 29.

Targets with sdk_version values up to and including 29 should not use
Java language level 9, even if EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true
is set.

This change fixes a downstream issue.

Bug: 131678633
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make droid tests docs cts java
Test: (same test in downstream branch)
Change-Id: Ic58e8df2e06d6e07bc42255314521831dc41b239

22 months agoMerge "Limit calls to strip.sh on darwin"
Treehugger Robot [Sat, 18 May 2019 01:57:37 +0000 (01:57 +0000)]
Merge "Limit calls to strip.sh on darwin"

22 months agoAdd an option to preserve symbols and debug_frame.
Christopher Ferris [Fri, 17 May 2019 23:39:54 +0000 (16:39 -0700)]
Add an option to preserve symbols and debug_frame.

New strip option named keep_symbols_and_debug_frame, that will keep the
symbols and the .debug_frame. This is meant for use by libc.so only on
arm32. Other libraries might want to use it to keep better unwinding
information on device.

Bug: 132992102

Test: Built libc.so with this option and verified that it contains
Test: the .debug_frame section.
Change-Id: I823a28199dec8316e8b26fe31ff9f17e6b11d406

22 months agoMerge changes I3dc3fded,Ic1276329,I6be04dec
Treehugger Robot [Sat, 18 May 2019 00:31:56 +0000 (00:31 +0000)]
Merge changes I3dc3fded,Ic1276329,I6be04dec

* changes:
  Add bpf_test.go to build and fix tests
  Don't create a second host arch for tests on darwin
  Move CreateTestContext to cc/testing.go

22 months agoLimit calls to strip.sh on darwin
Colin Cross [Fri, 17 May 2019 22:36:46 +0000 (15:36 -0700)]
Limit calls to strip.sh on darwin

strip.sh can use a file descriptor per .o file when run on .a files,
which can hit the system file descriptor limit on darwin.  This
causes failures when manay variants of libgcc_stripped are built
simultaneously.  Put all strip rules on darwin into a pool that
limits them to 10 concurrent processes, which will limit the file
descriptor usage to ~7500.

Fixes: 132822437
Test: no mention of darwinStripPool in out/soong/build.ninja on linux
Test: m libgcc_stripped on darwin
Change-Id: I3d4fbbd8d44d2e9059a79df113ab95336ec2c658

22 months agoMerge "Support using cc_prebuilt_library_shared with cc_library"
Treehugger Robot [Fri, 17 May 2019 22:44:53 +0000 (22:44 +0000)]
Merge "Support using cc_prebuilt_library_shared with cc_library"

22 months agoMerge "Soong: Add mk2bp conversion for prebuilt_font."
Treehugger Robot [Fri, 17 May 2019 17:45:08 +0000 (17:45 +0000)]
Merge "Soong: Add mk2bp conversion for prebuilt_font."

22 months agoTeach soong not to duplicate the HWASAN runtime into each APEX.
Peter Collingbourne [Wed, 24 Apr 2019 21:41:12 +0000 (14:41 -0700)]
Teach soong not to duplicate the HWASAN runtime into each APEX.

When HWASAN is enabled, the runtime is conceptually part of Bionic (and
mutually depends on it), so it needs to be treated in the same way as the
Bionic libs.

Now there are only two copies of the runtime: the one in
/system/lib64/bootstrap (which won't be used by ordinary processes) and the
one in the runtime APEX.

This reduces the size of the HWASAN system image and fixes an issue where
multiple copies of the HWASAN runtime were being loaded into 64-bit binaries in
APEXes because the linker namespace for the binary is different from the one
for its dependent libraries outside of APEXes. HWASAN only supports loading
one copy of the runtime per process, so this was causing such binaries to
crash on startup.

Change-Id: I228896e193a035e6dfba9f6e28d0b2e12fc163ea

22 months agoAdd bpf_test.go to build and fix tests
Colin Cross [Tue, 14 May 2019 23:05:20 +0000 (16:05 -0700)]
Add bpf_test.go to build and fix tests

bpf_test.go was not listed in testSrcs, which meant it was not run
during the build, but ran and failed with go test android/soong/...

Don't redeclare the cc module types and mutators, use exported
functions from cc/testing.go instead, which contain a new
dependency needed by cc modules.

This reapplies I4542640e8ff08e71565ed50617dbe67d86b29b69 after
fixes for mac tests.

Test: m
Test: go test android/soong/...
Change-Id: I3dc3fdedbd7063df4a2e0cadf2a4e0711b1823ad

22 months agoDon't create a second host arch for tests on darwin
Colin Cross [Tue, 14 May 2019 23:01:24 +0000 (16:01 -0700)]
Don't create a second host arch for tests on darwin

Only x86_64 darwin is supported, not x86.  Don't create an x86
host arch when running tests on darwin.

Test: all soong tests
Change-Id: Ic12763298345e32a1340f8fbef338d2ab4d62b2e

22 months agoMove CreateTestContext to cc/testing.go
Colin Cross [Tue, 14 May 2019 22:44:26 +0000 (15:44 -0700)]
Move CreateTestContext to cc/testing.go

Allow CreateTestContext to be called by tests in other packages
that need cc modules.

Test: all soong tests
Change-Id: I6be04dec50632baa8cb51e55ba14d0ddc0df60b8

22 months agoSupport using cc_prebuilt_library_shared with cc_library
Colin Cross [Tue, 14 May 2019 21:07:01 +0000 (14:07 -0700)]
Support using cc_prebuilt_library_shared with cc_library

Allow a cc_prebuilt_library_shared to share the same name as a
cc_library by always creating static and shared variants of
prebuilts so that the variants of the source module are always
a superset of the variants of the target module.

Bug: 131709055
Test: TestPrebuilts
Change-Id: I4afd6d37e6a986d08ad25aee69eca6d994febc6b

22 months agoMerge "Turn off dex actions for sourceless modules."
Jaewoong Jung [Thu, 16 May 2019 18:01:48 +0000 (18:01 +0000)]
Merge "Turn off dex actions for sourceless modules."

22 months agoSoong: Add mk2bp conversion for prebuilt_font.
Patrice Arruda [Thu, 16 May 2019 01:21:32 +0000 (18:21 -0700)]
Soong: Add mk2bp conversion for prebuilt_font.

There are a couple of makefiles that have etc with $(TARGET_OUT)/fonts
and $(TARGET_OUT_PRODUCT)/fonts  as the local module path. Added the
conversion in androidmk for target.

bug: b/123403785
Test: Wrote and ran unit test cases, did a test conversion on
        * platform/external/google-fonts/dancing-script/Android.mk
        * internal/external/google-fonts/arbutus-fonts/Android.mk
Change-Id: Id67e10f80b32b27c5027cd274a7944801dad0880

22 months agoMerge "Fix override_android_app dependency issues."
Jaewoong Jung [Thu, 16 May 2019 15:07:13 +0000 (15:07 +0000)]
Merge "Fix override_android_app dependency issues."

22 months agoMerge "Add No_dist property"
Treehugger Robot [Thu, 16 May 2019 01:25:53 +0000 (01:25 +0000)]
Merge "Add No_dist property"

22 months agoMerge "Soong: Add support on installing fonts in /fonts system image."
Treehugger Robot [Wed, 15 May 2019 23:53:28 +0000 (23:53 +0000)]
Merge "Soong: Add support on installing fonts in /fonts system image."

22 months agoTurn off dex actions for sourceless modules.
Jaewoong Jung [Mon, 13 May 2019 16:23:20 +0000 (09:23 -0700)]
Turn off dex actions for sourceless modules.

Test: dexpreopt_test.go
Fixes: 129370564
Change-Id: Ic292f37c4f782b14fce625b85817b58c31d3f276

22 months agoMerge "Generate VNDK snapshot with Soong except configs"
Inseob Kim [Wed, 15 May 2019 22:32:02 +0000 (15:32 -0700)]
Merge "Generate VNDK snapshot with Soong except configs"
am: 651f40bbe1

Change-Id: I2f0b74a3faef35e29640a1f67344654b8bb00187

22 months agoMerge "Generate VNDK snapshot with Soong except configs"
Treehugger Robot [Wed, 15 May 2019 22:13:35 +0000 (22:13 +0000)]
Merge "Generate VNDK snapshot with Soong except configs"

22 months agoSoong: Add support on installing fonts in /fonts system image.
Patrice Arruda [Tue, 14 May 2019 15:20:45 +0000 (08:20 -0700)]
Soong: Add support on installing fonts in /fonts system image.

A new module named prebuilt_font allows a set of fonts to be
installed in the /fonts system image.

Bug: b/123403785
Test: Wrote and ran unit test cases.
Change-Id: Icd468abe3d70a528b28a8d8f216407484e9966a7

22 months agoFix override_android_app dependency issues.
Jaewoong Jung [Fri, 10 May 2019 22:16:29 +0000 (15:16 -0700)]
Fix override_android_app dependency issues.

This change fixes an issue where an android_test could not depened on an
override_android_app or an android_app overridden by one by moving all
override processing to post-deps and forwarding incoming dependencies on
override_android_apps to base android_app modules

Fixes: 132447700
Test: app_test.go
Change-Id: I4ac593be661f541f5ea9823ef97373bee4b186f9

22 months agoMerge "Prevent hangs in OncePer when the callback panics"
Colin Cross [Wed, 15 May 2019 17:47:18 +0000 (10:47 -0700)]
Merge "Prevent hangs in OncePer when the callback panics"
am: b7afaf0802

Change-Id: I57d4803a024abd4d189fb2c6245eb49b2b2ac815

22 months agoAdd kotlin-stdlib-jdk8 when using Kotlin
Colin Cross [Mon, 13 May 2019 18:06:25 +0000 (11:06 -0700)]
Add kotlin-stdlib-jdk8 when using Kotlin

kotlin-stdlib-jdk8 contains extensions to the Kotlin standard library
for use when targeting Java language level 8.

Test: m checkbuild
Change-Id: Iac5f977f9080d8e0e2402b08a992a93c909744e9

22 months agoMerge "Prevent hangs in OncePer when the callback panics"
Colin Cross [Wed, 15 May 2019 17:16:37 +0000 (17:16 +0000)]
Merge "Prevent hangs in OncePer when the callback panics"

22 months agomanifest_fixer argument should be --use-embedded-dex rather than --use-embedded-dex...
Sasha Smundak [Wed, 15 May 2019 04:58:15 +0000 (21:58 -0700)]
manifest_fixer argument should be --use-embedded-dex rather than --use-embedded-dex=true
am: d2e5361c90

Change-Id: I39ea71483ead65a225e40ac8dee6a90a5dd5d0dc

22 months agoAdd No_dist property
Sundong Ahn [Mon, 13 May 2019 06:02:50 +0000 (15:02 +0900)]
Add No_dist property

For the sysprop apis, we don't need dist. So the No_dist property is
added for it.

Bug: 132448761
Test: m -j dist
Change-Id: I51c6a6b87ab9dc90b6825c0d4d414e958dd7b265

22 months agoGenerate VNDK snapshot with Soong except configs
Inseob Kim [Thu, 9 May 2019 04:29:15 +0000 (13:29 +0900)]
Generate VNDK snapshot with Soong except configs

This is the first commit to generate VNDK snapshot with Soong: .so
files, some txt files, and notice files are captured with Soong. As
ld.config.txt is currently in Android.mk and will be deprecated soon,
configs files (and zipping all of artifacts) are still handled with
Makefile.

Bug: 131564934
Test: 1) DIST_DIR=out/dist development/vndk/snapshot/build.sh
Test: 2) try installing vndk snapshot with:
     development/vndk/snapshot/update.py

Change-Id: I8629e1e25bfc461fd495565bb4872c9af176cf92

22 months agoRevert "Add bpf_test.go to build and fix the tests"
Colin Cross [Wed, 15 May 2019 00:29:16 +0000 (17:29 -0700)]
Revert "Add bpf_test.go to build and fix the tests"
am: d3d3ad1686

Change-Id: I393ed610a6cd1a8c6a9fa4e32085256c14483a01

22 months agomanifest_fixer argument should be --use-embedded-dex rather than --use-embedded-dex...
Sasha Smundak [Wed, 15 May 2019 00:03:24 +0000 (17:03 -0700)]
manifest_fixer argument should be --use-embedded-dex rather than --use-embedded-dex=true

Test: building soong tests, treehugger
Change-Id: Id0df92171a2e547794979fb473d8abc47f33d13c

22 months agoRevert "Add bpf_test.go to build and fix the tests"
Colin Cross [Tue, 14 May 2019 22:46:24 +0000 (22:46 +0000)]
Revert "Add bpf_test.go to build and fix the tests"

This reverts commit 192e3aa6a86c486c976cdd8587d5700aeb304241.

Reason for revert: broke mac tests

Change-Id: I3f4c679e11d9361dbc2daaf6c89282259b225d61

22 months agoAdd bpf_test.go to build and fix the tests
Colin Cross [Tue, 14 May 2019 22:08:10 +0000 (15:08 -0700)]
Add bpf_test.go to build and fix the tests
am: 192e3aa6a8

Change-Id: If8425dc910c3d5cf505364f892cbc7dcbfdfb2d0

22 months agoAdd bpf_test.go to build and fix the tests
Colin Cross [Mon, 13 May 2019 20:35:45 +0000 (13:35 -0700)]
Add bpf_test.go to build and fix the tests

bpf_test.go was not listed in testSrcs, which meant it was not run
during the build, but ran and failed with go test android/soong/...

Test: m
Test: go test android/soong/...
Change-Id: I4542640e8ff08e71565ed50617dbe67d86b29b69

22 months agoPrevent hangs in OncePer when the callback panics
Colin Cross [Tue, 14 May 2019 18:33:05 +0000 (11:33 -0700)]
Prevent hangs in OncePer when the callback panics

If the callback passed to Once panics it was leaving the waiter
in place that would never be completed.  Move writing the value
and signalling the waiter to defer.

Test: TestOncePerPanic
Change-Id: Icc4d3b779a79914fcd881d61d38dffcc2f591c39

22 months agoFix manifest_fixer_test.py
Jaewoong Jung [Tue, 14 May 2019 18:32:48 +0000 (11:32 -0700)]
Fix manifest_fixer_test.py
am: e4948c79d3

Change-Id: Iab73e4c3b4a4b0f30d779445b7c57093b658aeec

23 months agoFix manifest_fixer_test.py
Jaewoong Jung [Tue, 14 May 2019 15:06:16 +0000 (08:06 -0700)]
Fix manifest_fixer_test.py

Test: manifest_fixer_test.py
Change-Id: I18067070154578e2effad8c70bb07a414cbc6dc0

23 months agoMerge "Fixes typos in device_host_converter.go comments."
Jaewoong Jung [Tue, 14 May 2019 01:32:06 +0000 (18:32 -0700)]
Merge "Fixes typos in device_host_converter.go comments."
am: bc975e8b89

Change-Id: Ic86869fd88274d7ede9670123fdafc98921111cb

23 months agoMerge "Fixes typos in device_host_converter.go comments."
Treehugger Robot [Tue, 14 May 2019 01:16:27 +0000 (01:16 +0000)]
Merge "Fixes typos in device_host_converter.go comments."

23 months agoMerge "Remove libc_scudo library when building asan."
Christopher Ferris [Tue, 14 May 2019 00:27:53 +0000 (17:27 -0700)]
Merge "Remove libc_scudo library when building asan."
am: d7e66d9e7c

Change-Id: Ib422be5e7d9010f26e65da3ccbcd0f9755ac6108

23 months agoMerge "Remove libc_scudo library when building asan."
Christopher Ferris [Tue, 14 May 2019 00:12:33 +0000 (00:12 +0000)]
Merge "Remove libc_scudo library when building asan."

23 months agoFixes typos in device_host_converter.go comments.
Jaewoong Jung [Mon, 13 May 2019 22:11:23 +0000 (15:11 -0700)]
Fixes typos in device_host_converter.go comments.

Test: TreeHugger
Change-Id: Ie786e8fc950c3e9913c9d51f2b88bc036bb17462

23 months agoMerge "Don't hide *.kotlin_module in turbine dependencies"
Colin Cross [Mon, 13 May 2019 20:47:26 +0000 (13:47 -0700)]
Merge "Don't hide *.kotlin_module in turbine dependencies"
am: f3e802bf0d

Change-Id: Iae8813f9f4e8e9376d7e0f05f0834f7fc7324c80

23 months agoMerge "Don't hide *.kotlin_module in turbine dependencies"
Treehugger Robot [Mon, 13 May 2019 20:21:47 +0000 (20:21 +0000)]
Merge "Don't hide *.kotlin_module in turbine dependencies"

23 months agoMerge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries."
Sasha Smundak [Mon, 13 May 2019 18:39:30 +0000 (11:39 -0700)]
Merge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries."
am: 95aabdad9c

Change-Id: I1f5c14772b24ccbd377395ba9a9da46397207d7e

23 months agoMerge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries."
Treehugger Robot [Mon, 13 May 2019 18:30:33 +0000 (18:30 +0000)]
Merge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries."

23 months agoMerge "Uncompress dex file in imported apk when needed."
Jaewoong Jung [Mon, 13 May 2019 18:08:23 +0000 (11:08 -0700)]
Merge "Uncompress dex file in imported apk when needed."
am: b7cb607812

Change-Id: I02d2a4981b25986cf1b28f51fc3c8c97c9b6dbc2

23 months agoMerge "Uncompress dex file in imported apk when needed."
Jaewoong Jung [Mon, 13 May 2019 17:54:00 +0000 (17:54 +0000)]
Merge "Uncompress dex file in imported apk when needed."

23 months agoMerge "Make core-generated-annotation-stubs link as core stubs."
Pete Gillin [Mon, 13 May 2019 11:53:52 +0000 (04:53 -0700)]
Merge "Make core-generated-annotation-stubs link as core stubs."
am: dd6dd18ef6

Change-Id: I86172e280993167de25deceb22c3d4b08503e9f2

23 months agoMerge "Make core-generated-annotation-stubs link as core stubs."
Pete Gillin [Mon, 13 May 2019 11:37:43 +0000 (11:37 +0000)]
Merge "Make core-generated-annotation-stubs link as core stubs."

23 months agoMerge "Write dexpreopt.config again during the build"
Colin Cross [Sat, 11 May 2019 04:21:02 +0000 (21:21 -0700)]
Merge "Write dexpreopt.config again during the build"
am: 0967b34dd9

Change-Id: I9757bb82a1c04c32a8835d9db85661544d04fb04

23 months agoMerge "Write dexpreopt.config again during the build"
Colin Cross [Sat, 11 May 2019 04:11:58 +0000 (04:11 +0000)]
Merge "Write dexpreopt.config again during the build"

23 months agoMerge "Soong: Add mk2bp conversion for prebuilt_usr_share."
Patrice Arruda [Sat, 11 May 2019 00:08:22 +0000 (17:08 -0700)]
Merge "Soong: Add mk2bp conversion for prebuilt_usr_share."
am: bebfdea437

Change-Id: I42048f913b1620aa7cdbfbec67c492264bdbc968

23 months agoMerge "Soong: Add mk2bp conversion for prebuilt_usr_share."
Treehugger Robot [Fri, 10 May 2019 22:30:43 +0000 (22:30 +0000)]
Merge "Soong: Add mk2bp conversion for prebuilt_usr_share."

23 months agoSoong: Add mk2bp conversion for prebuilt_usr_share.
Patrice Arruda [Wed, 8 May 2019 17:16:21 +0000 (10:16 -0700)]
Soong: Add mk2bp conversion for prebuilt_usr_share.

There are a couple of makefiles that have etc with $(TARGET_OUT)/usr/share
as the local module path. Added the conversion in androidmk for target
and host.

Bug: b/132123818
Test: Wrote and ran unit test cases, did a test conversion on
      external/neven/Android.mk makefile.

Change-Id: Iafed89f4cee499f561a1235f8870b1f1329e99bc

23 months agoWrite dexpreopt.config again during the build
Colin Cross [Fri, 10 May 2019 04:50:00 +0000 (21:50 -0700)]
Write dexpreopt.config again during the build

Writing $OUT/dexpreopt.config during build setup and then using
it during the build causes bad incremental builds if a cleanspec
removes $OUT/dexpreopt.config.  Create a rule in Soong to write
out a copy so that it is a normal build artifact.

Bug: 132379813
Test: m checkbuild
Change-Id: I7755a7f8c1d6561fc83022a7f4cf7e4a64e989c9

23 months agoMerge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
Pete Gillin [Fri, 10 May 2019 12:16:29 +0000 (05:16 -0700)]
Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
am: 42e862c56d

Change-Id: Ibb15d93fcd46afe642834992d25e18c3bf13395f

23 months agoMake core-generated-annotation-stubs link as core stubs.
Pete Gillin [Wed, 8 May 2019 14:10:06 +0000 (15:10 +0100)]
Make core-generated-annotation-stubs link as core stubs.

Bug: 123891440
Test: EXPERIMENTAL_USE_OPENJDK9=true make droid

(cherry picked from commit 4528becc46d69963a838c5af05e6ad9075b63bbe)

Merged-In: I117828f13a604030d1c36bdb60fffec4c4e08d6e
Change-Id: I17fa4e0c4106b63bf3cb0e3c3f78498a4072d9f5

23 months agoMerge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
Pete Gillin [Fri, 10 May 2019 11:50:08 +0000 (11:50 +0000)]
Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."

23 months agoMerge "Enable native bridge support by default for certain ndk modules"
Dimitry Ivanov [Fri, 10 May 2019 09:06:42 +0000 (02:06 -0700)]
Merge "Enable native bridge support by default for certain ndk modules"
am: 9c9fd4e73a

Change-Id: I7fcfa81029bcb1db87334e5cf2ed26604a7c33b1

23 months agoMerge "Enable native bridge support by default for certain ndk modules"
Dimitry Ivanov [Fri, 10 May 2019 08:16:49 +0000 (08:16 +0000)]
Merge "Enable native bridge support by default for certain ndk modules"

23 months agoMerge "Go back to the host sed until we have a faster prebuilt."
Elliott Hughes [Fri, 10 May 2019 02:44:49 +0000 (19:44 -0700)]
Merge "Go back to the host sed until we have a faster prebuilt."
am: 4af530ff72

Change-Id: I6d7bd3b4b9cd2cc5072db54421f0daa7a7372ee6

23 months agoMerge "Attach global variables to Context"
Inseob Kim [Fri, 10 May 2019 00:34:42 +0000 (17:34 -0700)]
Merge "Attach global variables to Context"
am: a1591ab08c

Change-Id: I755960fab4c3b3b7f9e2075e6cd1538dfe112321

23 months ago[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
Xin Li [Fri, 10 May 2019 00:30:02 +0000 (17:30 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "
am: 7592444a02 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieeb5d3916b626045d4c53d8b4c5a03825550fd11

23 months agoMerge "Go back to the host sed until we have a faster prebuilt."
Treehugger Robot [Thu, 9 May 2019 23:17:05 +0000 (23:17 +0000)]
Merge "Go back to the host sed until we have a faster prebuilt."

23 months ago[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Xin Li [Thu, 9 May 2019 22:51:13 +0000 (15:51 -0700)]
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into 
am: e0ec6c7f00 -s ours
am skip reason: subject contains skip directive

Change-Id: Id8321d46c435763de1b2fea98df76524f1df7892

23 months agoMerge "Attach global variables to Context"
Treehugger Robot [Thu, 9 May 2019 22:36:30 +0000 (22:36 +0000)]
Merge "Attach global variables to Context"

23 months agoMerge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
Xin Li [Thu, 9 May 2019 22:05:50 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "

23 months agoUncompress dex file in imported apk when needed.
Jaewoong Jung [Thu, 9 May 2019 21:36:34 +0000 (14:36 -0700)]
Uncompress dex file in imported apk when needed.

This implements the uncompress-dexs macro's behavior in Soong.

Test: Converted TvSampleLeanbackLauncher + zipinfo
Change-Id: I9477aa21429d055f3f36ca90c7fd2c345c999029

23 months agoMerge "Make device_kernel_headers available to recovery and vendor"
Tao Bao [Thu, 9 May 2019 21:25:25 +0000 (14:25 -0700)]
Merge "Make device_kernel_headers available to recovery and vendor"
am: fcf9979aa7

Change-Id: I1900688e4088d3eab7f898c3f68a8f8945e4efbe

23 months agoGo back to the host sed until we have a faster prebuilt.
Elliott Hughes [Thu, 9 May 2019 20:59:01 +0000 (13:59 -0700)]
Go back to the host sed until we have a faster prebuilt.

Bug: https://issuetracker.google.com/131747477
Test: treehugger
Change-Id: I120fe1200216afdb492bd1353848d12a4be1f496

23 months agoRemove libc_scudo library when building asan.
Christopher Ferris [Thu, 9 May 2019 20:27:02 +0000 (13:27 -0700)]
Remove libc_scudo library when building asan.

Running any executable built with asan and libc_scudo results in crashes.

Bug: 131810078

Test: Built the media processes with the sanitizer enabled verifying
Test: that the libc_scudo.so shared library is not listed in the
Test: mediaextractor and the mediaswcodec binaries.
Test: Build the media processes without the sanitizer enabled verifying
Test: that the libc_scudo.so shared library is listed in the
Test: mediaextractor and the mediaswcodec binaries.
Change-Id: Ie55a0414088787ec11d85fffcb04592ed4f23c57

23 months agoMerge "Make device_kernel_headers available to recovery and vendor"
Tao Bao [Thu, 9 May 2019 20:27:48 +0000 (20:27 +0000)]
Merge "Make device_kernel_headers available to recovery and vendor"

23 months agoMerge "Fix dangling rules on aosp_cf_x86_phone"
Colin Cross [Thu, 9 May 2019 16:27:40 +0000 (09:27 -0700)]
Merge "Fix dangling rules on aosp_cf_x86_phone"
am: 11cd91dada

Change-Id: Ic528bc1b80e697f8736727a78d376606cbf38d8f

23 months agoDO NOT MERGE - Merge Pie Bonito/Sargo into master.
Xin Li [Thu, 9 May 2019 16:27:02 +0000 (09:27 -0700)]
DO NOT MERGE - Merge Pie Bonito/Sargo into master.

Bug: 131756210
Change-Id: I00db6c50910291f4b200e3d7d2942e367fe0c358

23 months agoMerge "Fix dangling rules on aosp_cf_x86_phone"
Treehugger Robot [Thu, 9 May 2019 16:16:01 +0000 (16:16 +0000)]
Merge "Fix dangling rules on aosp_cf_x86_phone"

23 months agoEnable native bridge support by default for certain ndk modules
dimitry [Thu, 9 May 2019 12:07:34 +0000 (14:07 +0200)]
Enable native bridge support by default for certain ndk modules

The ndk_library, ndk_prebuilt_object and ndk_prebuilt_static_stl
modules are natural targets to have native bridge support enabled,
since they build user facing object which have to be supported for
translated architectures.

Bug: http://b/77159578
Test: make
Change-Id: Ic556f4c1c41e5b3dc92f9c290b4482dee8faed33

23 months agoRename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.
Pete Gillin [Thu, 2 May 2019 14:32:11 +0000 (15:32 +0100)]
Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.

The current EXPERIMENTAL_USE_OPENJDK9 environment variable is a legacy
from when the 8 -> 9 toolchain upgrade was happening. That migration
is done and the variable only affects the language level, so it should
have a name that reflects that. (The current situation would be
especially confusing if we started a 9 -> 11 toolchain upgrade,
presumably controlled by a variable like EXPERIMENTAL_USE_OPENJDK11,
since the two settings look incompatible but are actually orthogonal.)

The current variable historically allowed a value or "1.8" which meant
"use the OpenJDK 9 toolchain but target language level 8". That value
no longer has any meaning and the new variable doesn't allow it.

Bug: 131678633
Test: `make` with `EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true`
Test: `javap -v $OUT_DIR/soong/.intermediates/libcore/core-oj/android_common/javac/classes/java/util/List.class | grep 'major version'` shows 53
Test: Audit all mentions of the old string here and downstream
Change-Id: Idad808c7f07913baba1a777627322d5452dabcef

23 months agoMake device_kernel_headers available to recovery and vendor
Hridya Valsaraju [Tue, 21 Aug 2018 22:51:20 +0000 (15:51 -0700)]
Make device_kernel_headers available to recovery and vendor

This is required to build the recovery variant of boot control HAL.

Bug: 78793464
Test: make
Bug: 34254109
Change-Id: Ia5d7b1a97926acbe4ba89df26aeb66fac6bbb1ab
Merged-In: Ia5d7b1a97926acbe4ba89df26aeb66fac6bbb1ab
(cherry picked from commit 1a3b62757cfbecae83910f70c87119b819765a4c)

23 months agoAttach global variables to Context
Inseob Kim [Thu, 9 May 2019 01:56:13 +0000 (10:56 +0900)]
Attach global variables to Context

Global variables make testing difficult, and they should attached to
Context.

Bug: N/A
Test: m
Change-Id: Ic671dda755e99d036c7ddce0eed114496374d7ec

23 months agoMerge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY"
Dan Willemsen [Thu, 9 May 2019 00:10:53 +0000 (17:10 -0700)]
Merge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY"
am: ffff95bc4e

Change-Id: I224b1245731adaa25670613a42deedc901229f8d

23 months agoMerge "Implement DPI variants in android_app_import."
Jaewoong Jung [Thu, 9 May 2019 00:10:33 +0000 (17:10 -0700)]
Merge "Implement DPI variants in android_app_import."
am: 53ad63c127

Change-Id: I31388577fa67e0d1583a9b58f89c5f56bd223588

23 months agoMerge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY"
Treehugger Robot [Wed, 8 May 2019 23:44:47 +0000 (23:44 +0000)]
Merge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY"

23 months agoMerge "Implement DPI variants in android_app_import."
Jaewoong Jung [Wed, 8 May 2019 23:34:04 +0000 (23:34 +0000)]
Merge "Implement DPI variants in android_app_import."

23 months agoFix dangling rules on aosp_cf_x86_phone
Colin Cross [Wed, 8 May 2019 22:18:22 +0000 (15:18 -0700)]
Fix dangling rules on aosp_cf_x86_phone

aosp_cf_x86_phone uses SecondArchIsTranslated, which was leaving
a dangling rule from the oatdump rules to
out/soong/vsoc_x86/dex_bootjars/system/framework/arm/boot.art.
Consolidate the code to select targets for dexpreopting and use it
in more places to prevent references to boot images that were not
generated.

Test: m checkbuild
Change-Id: Ia4945a99ff5e575e759299106559c85f38489acc

23 months agoDon't hide *.kotlin_module in turbine dependencies
Colin Cross [Wed, 8 May 2019 21:30:12 +0000 (14:30 -0700)]
Don't hide *.kotlin_module in turbine dependencies

The jars containing the merged header classes from transitive
static dependencies were stripping all of META-INF/.  Kotlin
puts metadata in META-INF that is used to map the package to
the static class that contains the package-level functions.

This also exposed that the metadata in META-INF is always
called "name.kotlin_module", so a library that contains
kotlin files with a dependency that also contains kotlin files
would shade the metadata file.  Use a unique name instead.

Fixes: 131709692
Test: m checkbuild
Change-Id: I5cd276e563206e37c4c0d90fe9f346e9396f88c0

23 months agoDon't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY
Dan Willemsen [Wed, 8 May 2019 19:38:49 +0000 (12:38 -0700)]
Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY

These have been errors for years, and are now marked as obsolete.

Test: treehugger
Change-Id: I8055ab689ce5085df763378ad40d9b9aaa7ca85b

23 months agoAdd aaudio, amidi, camera2ndk and nativewindow NDK libraries.
Sasha Smundak [Wed, 20 Mar 2019 00:13:17 +0000 (17:13 -0700)]
Add aaudio, amidi, camera2ndk and nativewindow NDK libraries.

Various CTS tests refer to them.
Test: treehugger
Change-Id: I455063b02ec872c430edb1c619d38323d7ffd488

23 months agoImplement DPI variants in android_app_import.
Jaewoong Jung [Fri, 26 Apr 2019 21:31:50 +0000 (14:31 -0700)]
Implement DPI variants in android_app_import.

Bug: 128610294
Test: app_test.go
Change-Id: Ie3e558bfdb40de6b0b9df95d3b373d08a4084d7b

23 months agoMerge "Track sources for srcjars across modules"
Colin Cross [Tue, 7 May 2019 17:38:18 +0000 (10:38 -0700)]
Merge "Track sources for srcjars across modules"
am: 082640d6ee

Change-Id: Ia5505e67614e1531acd9fed44491faef4596a62c

23 months agoMerge "Track sources for srcjars across modules" android-o-mr1-iot-release-1.0.12
Treehugger Robot [Tue, 7 May 2019 17:25:52 +0000 (17:25 +0000)]
Merge "Track sources for srcjars across modules"

23 months agoMerge "Allow module types to generate resources"
Colin Cross [Tue, 7 May 2019 14:36:39 +0000 (07:36 -0700)]
Merge "Allow module types to generate resources"
am: da2bba1d71

Change-Id: I0ad142dadec08bd50ab8fdaa1f6dada0bf24a069

23 months agoMerge "Allow module types to generate resources"
Treehugger Robot [Tue, 7 May 2019 14:19:52 +0000 (14:19 +0000)]
Merge "Allow module types to generate resources"

23 months agoMerge "Exclude libgcc_stripped wherever libgcc is excluded"
Yi Kong [Tue, 7 May 2019 03:13:01 +0000 (20:13 -0700)]
Merge "Exclude libgcc_stripped wherever libgcc is excluded"
am: 3277c39c6b

Change-Id: Idbe82ea4a3e5cb9a9a7c194dd0a4d8a282d56c03

23 months agoMerge "Exclude libgcc_stripped wherever libgcc is excluded"
Yi Kong [Tue, 7 May 2019 02:57:24 +0000 (02:57 +0000)]
Merge "Exclude libgcc_stripped wherever libgcc is excluded"

23 months agoMerge "Soong: Refactor the soong_ui arguments processing to be more like bazel."
Patrice Arruda [Tue, 7 May 2019 01:32:11 +0000 (18:32 -0700)]
Merge "Soong: Refactor the soong_ui arguments processing to be more like bazel."
am: 565ee6ed87

Change-Id: I4dd6ef7ac341857201969a830d8caf76e28cdfd5