Commit Graph

11805 Commits

Author SHA1 Message Date
Colin Cross 66bdb695ae 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
2019-05-14 18:40:13 +00:00
Jaewoong Jung 3cb6b2ef28 Fix manifest_fixer_test.py
am: e4948c79d3

Change-Id: Iab73e4c3b4a4b0f30d779445b7c57093b658aeec
2019-05-14 11:32:48 -07:00
Jaewoong Jung e4948c79d3 Fix manifest_fixer_test.py
Test: manifest_fixer_test.py
Change-Id: I18067070154578e2effad8c70bb07a414cbc6dc0
2019-05-14 08:07:27 -07:00
Jaewoong Jung 1d5d99d652 Merge "Fixes typos in device_host_converter.go comments."
am: bc975e8b89

Change-Id: Ic86869fd88274d7ede9670123fdafc98921111cb
2019-05-13 18:32:06 -07:00
Treehugger Robot bc975e8b89 Merge "Fixes typos in device_host_converter.go comments." 2019-05-14 01:16:27 +00:00
Christopher Ferris 486b170bbc Merge "Remove libc_scudo library when building asan."
am: d7e66d9e7c

Change-Id: Ib422be5e7d9010f26e65da3ccbcd0f9755ac6108
2019-05-13 17:27:53 -07:00
Christopher Ferris d7e66d9e7c Merge "Remove libc_scudo library when building asan." 2019-05-14 00:12:33 +00:00
Jaewoong Jung 707d788ea2 Fixes typos in device_host_converter.go comments.
Test: TreeHugger
Change-Id: Ie786e8fc950c3e9913c9d51f2b88bc036bb17462
2019-05-13 15:11:23 -07:00
Colin Cross 9a7ee9da1b Merge "Don't hide *.kotlin_module in turbine dependencies"
am: f3e802bf0d

Change-Id: Iae8813f9f4e8e9376d7e0f05f0834f7fc7324c80
2019-05-13 13:47:26 -07:00
Treehugger Robot f3e802bf0d Merge "Don't hide *.kotlin_module in turbine dependencies" 2019-05-13 20:21:47 +00:00
Sasha Smundak f742a23db7 Merge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries."
am: 95aabdad9c

Change-Id: I1f5c14772b24ccbd377395ba9a9da46397207d7e
2019-05-13 11:39:30 -07:00
Treehugger Robot 95aabdad9c Merge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries." 2019-05-13 18:30:33 +00:00
Jaewoong Jung 142ec3bf4a Merge "Uncompress dex file in imported apk when needed."
am: b7cb607812

Change-Id: I02d2a4981b25986cf1b28f51fc3c8c97c9b6dbc2
2019-05-13 11:08:23 -07:00
Jaewoong Jung b7cb607812 Merge "Uncompress dex file in imported apk when needed." 2019-05-13 17:54:00 +00:00
Pete Gillin 075ed06c48 Merge "Make core-generated-annotation-stubs link as core stubs."
am: dd6dd18ef6

Change-Id: I86172e280993167de25deceb22c3d4b08503e9f2
2019-05-13 04:53:52 -07:00
Pete Gillin dd6dd18ef6 Merge "Make core-generated-annotation-stubs link as core stubs." 2019-05-13 11:37:43 +00:00
Colin Cross 927aad4f0a Merge "Write dexpreopt.config again during the build"
am: 0967b34dd9

Change-Id: I9757bb82a1c04c32a8835d9db85661544d04fb04
2019-05-10 21:21:02 -07:00
Colin Cross 0967b34dd9 Merge "Write dexpreopt.config again during the build" 2019-05-11 04:11:58 +00:00
Patrice Arruda c0b973ac72 Merge "Soong: Add mk2bp conversion for prebuilt_usr_share."
am: bebfdea437

Change-Id: I42048f913b1620aa7cdbfbec67c492264bdbc968
2019-05-10 17:08:22 -07:00
Treehugger Robot bebfdea437 Merge "Soong: Add mk2bp conversion for prebuilt_usr_share." 2019-05-10 22:30:43 +00:00
Patrice Arruda 77311df787 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
2019-05-10 12:59:37 -07:00
Colin Cross 2d00f0dcae 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
2019-05-10 07:07:21 -07:00
Pete Gillin 350f0987bf Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
am: 42e862c56d

Change-Id: Ibb15d93fcd46afe642834992d25e18c3bf13395f
2019-05-10 05:16:29 -07:00
Pete Gillin cbff326fe6 Make core-generated-annotation-stubs link as core stubs.
Bug: 123891440
Test: EXPERIMENTAL_USE_OPENJDK9=true make droid

(cherry picked from commit 4528becc46)

Merged-In: I117828f13a604030d1c36bdb60fffec4c4e08d6e
Change-Id: I17fa4e0c4106b63bf3cb0e3c3f78498a4072d9f5
2019-05-10 13:05:23 +01:00
Pete Gillin 42e862c56d Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." 2019-05-10 11:50:08 +00:00
Dimitry Ivanov 64ad4e8d72 Merge "Enable native bridge support by default for certain ndk modules"
am: 9c9fd4e73a

Change-Id: I7fcfa81029bcb1db87334e5cf2ed26604a7c33b1
2019-05-10 02:06:42 -07:00
Dimitry Ivanov 9c9fd4e73a Merge "Enable native bridge support by default for certain ndk modules" 2019-05-10 08:16:49 +00:00
Elliott Hughes 3408d62c2f Merge "Go back to the host sed until we have a faster prebuilt."
am: 4af530ff72

Change-Id: I6d7bd3b4b9cd2cc5072db54421f0daa7a7372ee6
2019-05-09 19:44:49 -07:00
Inseob Kim 66c5cac22b Merge "Attach global variables to Context"
am: a1591ab08c

Change-Id: I755960fab4c3b3b7f9e2075e6cd1538dfe112321
2019-05-09 17:34:42 -07:00
Xin Li 7b7f45b3fc [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: 7592444a02 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieeb5d3916b626045d4c53d8b4c5a03825550fd11
2019-05-09 17:30:02 -07:00
Treehugger Robot 4af530ff72 Merge "Go back to the host sed until we have a faster prebuilt." 2019-05-09 23:17:05 +00:00
Xin Li f528ca60c9 [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: e0ec6c7f00 -s ours
am skip reason: subject contains skip directive

Change-Id: Id8321d46c435763de1b2fea98df76524f1df7892
2019-05-09 15:51:13 -07:00
Treehugger Robot a1591ab08c Merge "Attach global variables to Context" 2019-05-09 22:36:30 +00:00
Xin Li 7592444a02 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:50 +00:00
Jaewoong Jung ea1bdb002d 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
2019-05-09 14:38:11 -07:00
Tao Bao 5a6e89d092 Merge "Make device_kernel_headers available to recovery and vendor"
am: fcf9979aa7

Change-Id: I1900688e4088d3eab7f898c3f68a8f8945e4efbe
2019-05-09 14:25:25 -07:00
Elliott Hughes 18e0d5e0f0 Go back to the host sed until we have a faster prebuilt.
Bug: https://issuetracker.google.com/131747477
Test: treehugger
Change-Id: I120fe1200216afdb492bd1353848d12a4be1f496
2019-05-09 13:59:01 -07:00
Christopher Ferris 753d4a69d5 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
2019-05-09 13:35:37 -07:00
Tao Bao fcf9979aa7 Merge "Make device_kernel_headers available to recovery and vendor" 2019-05-09 20:27:48 +00:00
Colin Cross 48fcec3d03 Merge "Fix dangling rules on aosp_cf_x86_phone"
am: 11cd91dada

Change-Id: Ic528bc1b80e697f8736727a78d376606cbf38d8f
2019-05-09 09:27:40 -07:00
Xin Li e0ec6c7f00 DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug: 131756210
Change-Id: I00db6c50910291f4b200e3d7d2942e367fe0c358
2019-05-09 09:27:02 -07:00
Treehugger Robot 11cd91dada Merge "Fix dangling rules on aosp_cf_x86_phone" 2019-05-09 16:16:01 +00:00
dimitry 03dc3f63f6 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
2019-05-09 16:37:16 +02:00
Pete Gillin 0c2143e1ee 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
2019-05-09 15:36:29 +01:00
Hridya Valsaraju d61df5041e 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 1a3b62757c)
2019-05-08 22:58:10 -07:00
Inseob Kim 9516ee9556 Attach global variables to Context
Global variables make testing difficult, and they should attached to
Context.

Bug: N/A
Test: m
Change-Id: Ic671dda755e99d036c7ddce0eed114496374d7ec
2019-05-09 12:29:58 +09:00
Dan Willemsen 570df4b7b9 Merge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY"
am: ffff95bc4e

Change-Id: I224b1245731adaa25670613a42deedc901229f8d
2019-05-08 17:10:53 -07:00
Jaewoong Jung a64eb7eada Merge "Implement DPI variants in android_app_import."
am: 53ad63c127

Change-Id: I31388577fa67e0d1583a9b58f89c5f56bd223588
2019-05-08 17:10:33 -07:00
Treehugger Robot ffff95bc4e Merge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY" 2019-05-08 23:44:47 +00:00
Jaewoong Jung 53ad63c127 Merge "Implement DPI variants in android_app_import." 2019-05-08 23:34:04 +00:00