Commit Graph

19689 Commits

Author SHA1 Message Date
Jaewoong Jung
068e22ebb9 Merge "Make android_app_import multi targets arch module." am: baf8c3a804
Change-Id: I55e944d317d65bc0326b2751865fc6f1554abb85
2020-05-05 01:33:06 +00:00
Jaewoong Jung
baf8c3a804 Merge "Make android_app_import multi targets arch module." 2020-05-05 01:20:51 +00:00
Treehugger Robot
725991c85a Merge changes I2e370952,I811cc8e1 am: f39f6a4772
Change-Id: I80f4a009c5b7abaacd620678061c3f4af9bdf3d4
2020-05-04 22:23:07 +00:00
Treehugger Robot
f39f6a4772 Merge changes I2e370952,I811cc8e1
* changes:
  Remove TEMPORARY_DISABLE_PATH_RESTRICTIONS
  nsjail: Always remount /tmp before src/out/dist
2020-05-04 22:11:18 +00:00
Anton Hansson
f3a8ac39de Merge "Fix soong crashing when there's no baseline file" am: ede5078144
Change-Id: I824e3e5a5e16acc5faf55be55e28e288b6bad34f
2020-05-04 20:49:52 +00:00
Anton Hansson
ede5078144 Merge "Fix soong crashing when there's no baseline file" 2020-05-04 20:33:26 +00:00
Dan Willemsen
347ba75679 Remove TEMPORARY_DISABLE_PATH_RESTRICTIONS
This was a temporary migration tool, and has been broken ever since the
ninja environment started being restricted. Remove it, since it has
lasted two releases.

Test: TEMPORARY_DISABLE_PATH_RESTRICTIONS=true m
Change-Id: I2e3709525598030f5c24d12fa966e531dfed33ae
2020-05-04 19:54:57 +00:00
Treehugger Robot
deaf0b2d07 Merge "Report visibility errors in both check and gather phases" am: e661212b76
Change-Id: I80a609915802545a340a4c8b7227712f29eac128
2020-05-04 17:42:56 +00:00
Treehugger Robot
5879210577 Merge "Reduce duplication in visibility property management" am: b6b0ca1d87
Change-Id: Id070475dd4bf9ceae3c6b60960d54a3b64fd9f50
2020-05-04 17:42:49 +00:00
Treehugger Robot
e661212b76 Merge "Report visibility errors in both check and gather phases" 2020-05-04 17:25:45 +00:00
Treehugger Robot
b6b0ca1d87 Merge "Reduce duplication in visibility property management" 2020-05-04 17:25:29 +00:00
satayev
858239ce20 Merge "Ensure APEX's Java deps use stable SDKs." am: 9d6ea77c52
Change-Id: Ifb2eb5e7212fbbe979ad609e5a0c57fd058cdf07
2020-05-04 16:21:57 +00:00
satayev
9d6ea77c52 Merge "Ensure APEX's Java deps use stable SDKs." 2020-05-04 16:03:44 +00:00
Ulya Trafimovich
0e3f053f53 Add forgotten apex prefix to Jacoco boot image module. am: 817133ee2a
Change-Id: I4af7102ea684249565ecea8d147429375d6d16d1
2020-05-04 13:38:05 +00:00
Ulya Trafimovich
817133ee2a Add forgotten apex prefix to Jacoco boot image module.
This is a follow-up for https://r.android.com/1292915, which introduced
two-column format for the components of the boot jar list. This CL
fixes build failure for the coverage build.

Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Change-Id: Ib8b156bf81943fe07084cbce5e7e9bf70e759a5d
2020-05-04 12:16:25 +01:00
Treehugger Robot
f260c2e143 Merge "Don't tell make about modules in other namespaces" am: 266a66e20c
Change-Id: I8909dde91502e84a958a7fa52a8b0fc1f580619e
2020-05-04 09:02:46 +00:00
Ulyana Trafimovich
728f0c5dae Merge "Use two-column format for PRODUCT_BOOT_JARS components." am: 2aa8e0be11
Change-Id: I739836060e0af410efcff2a7ef353995951d946d
2020-05-04 09:02:10 +00:00
Treehugger Robot
266a66e20c Merge "Don't tell make about modules in other namespaces" 2020-05-04 09:02:06 +00:00
Ulyana Trafimovich
2aa8e0be11 Merge "Use two-column format for PRODUCT_BOOT_JARS components." 2020-05-04 08:57:47 +00:00
Jiyong Park
7e191d264a Dependencies of tests are also included in APEX am: af9539fd14
Change-Id: Iaab0f5d7239260d63d75aa81224fc53b568da131
2020-05-04 08:52:47 +00:00
Dan Willemsen
b5b2aba43b Don't tell make about modules in other namespaces
This was causing build breaks when different devices moved to Android.bp
at different times.

Bug: 150878976
Test: build *_hwasan targets
Change-Id: I68912bb6a5696809c318d1ec816a1bcfbe2df245
Merged-In: I68912bb6a5696809c318d1ec816a1bcfbe2df245
(cherry picked from commit 7b6af23db6)
2020-05-04 00:05:47 -07:00
Jiyong Park
af9539fd14 Dependencies of tests are also included in APEX
Shared lib dependencies of a test is included in the APEX regardless of
whether the test has test_per_srcs or not.

Bug: N/A
Test: m (apex_test.go amended)
Change-Id: I6b16843cc7467c42e250aba88d79d5580ba47324
2020-05-04 10:31:32 +09:00
Anton Hansson
75ac71eea2 Fix soong crashing when there's no baseline file
Soong was referencing the baseline file regardless of whether it was
valid or not.

Also update the lint message to match the one metalava itself prints,
which only suggests whitelisting the error if it's not possible to fix
it properly.

Bug: 154616909
Test: m (with lint error)
Change-Id: I4c6ec327a59aefe74825b4c4719393dd267ba3aa
Merged-In: I4c6ec327a59aefe74825b4c4719393dd267ba3aa
(cherry picked from commit 34ced82d2a)
2020-05-02 11:23:34 +01:00
Evgenii Stepanov
450659d229 Merge "[soong] Zero and pattern initialization of heap memory." am: b39e15d3f3
Change-Id: Ia3d3356340112f36367b5f48b75d91234bc9c25a
2020-05-02 00:09:48 +00:00
Evgenii Stepanov
b39e15d3f3 Merge "[soong] Zero and pattern initialization of heap memory." 2020-05-01 23:58:48 +00:00
Dan Willemsen
1612e2641e nsjail: Always remount /tmp before src/out/dist
A user was trying to use OUT_DIR=/tmp/...-out DIST_DIR=/tmp/...-dist

Test: OUT_DIR=/tmp/test-out DIST_DIR=/tmp/test-dist m nothing
Change-Id: I811cc8e1bda8d766406603df47309a8637cef48c
2020-05-01 16:26:56 -07:00
Jaewoong Jung
243688ea1b Make android_app_import multi targets arch module.
This makes it consistent with android_app. Also, most android_app_import
modules with JNI libs target a single arch.

Test: TreeHugger
Bug: 154281342
Change-Id: I5bbb2d2b733bbd6b868898285683ba5ff45be10b
2020-05-01 15:50:08 -07:00
Songchun Fan
2f0dd15e2c Revert "[soong] new field in Android.bp to request APK signing V4" am: 4b25e319e6
Change-Id: I1802ddcad193783a2a734e37e1356be9861f9952
2020-05-01 19:42:47 +00:00
Songchun Fan
4b25e319e6 Revert "[soong] new field in Android.bp to request APK signing V4"
This reverts commit 17d69e3484.

Reason for revert: This new field is not useful without dependencies in aosp

Test: builds
Change-Id: I87bd820cd6dbc5274ce3d28c4578381718aa805d
Merged-In: I70d6f7dc751510311b03e245b2189a76b395a49c
2020-05-01 11:29:36 -07:00
Paul Duffin
0c83aba28e Report visibility errors in both check and gather phases
Previously, errors that were found when splitting visibility rules were
only reported in the check phase and simply ignored during the gather
phase. That was because every visibility property that was processed in
the gather phase had already been checked in the check phase. However,
that is not strictly true as it has always been possible to add a
mutator between the check and gather phases that creates a module with
invalid visibility properties that will just be ignored. Fortunately,
that has not happened.

A follow up commit will add the capability to create modules after the
defaults have been applied which means the chances of invalid visibility
properties being ignored will increase.

This change makes both phases report any errors they find. It will not
have any impact on existing code as if any errors are reported in the
check phase then the build will exit before the gather phase. It will
prevent any invalid visibility errors from being ignored.

Bug: 155295806
Test: m nothing
Change-Id: I101fa6b03d2530b16e4394a9e466fead48be0ff0
2020-05-01 18:35:07 +01:00
Paul Duffin
5ec73ecc08 Reduce duplication in visibility property management
Adds a couple of new methods to manage visibility property instances to
reduce duplication and encapsulate the implementation slightly better.

The AddVisibilityProperty method is exported as it will be needed by
other packages in follow up commits.

Bug: 155295806
Test: m nothing
Change-Id: Ic1a9bb1e151fc6ae65761344fd210b4e4ba74fbc
2020-05-01 18:35:05 +01:00
Ivan Lozano
67c8638693 Merge "Test for rust install path regressions." am: f752c21f09
Change-Id: I49a946f708604dd6e8e4de0f45f038bced5ec16b
2020-05-01 17:27:54 +00:00
Ivan Lozano
f752c21f09 Merge "Test for rust install path regressions." 2020-05-01 17:16:52 +00:00
Nicolas Geoffray
1309f4efc5 Merge "Fix dex2oat symlink now that we generate dex2oat32/dex2oat64." am: b8bb5d05ce
Change-Id: I491793c8a867a1f4d240580e9d2c57999b894c16
2020-05-01 14:05:31 +00:00
Nicolas Geoffray
b8bb5d05ce Merge "Fix dex2oat symlink now that we generate dex2oat32/dex2oat64." 2020-05-01 13:49:51 +00:00
Nicolas Geoffray
d2a61c8752 Fix dex2oat symlink now that we generate dex2oat32/dex2oat64.
Test: m
Bug: 155257660
Change-Id: I466feabc64c0fb77fcf652be81bc0c4944b84ac0
Merged-In: I466feabc64c0fb77fcf652be81bc0c4944b84ac0
(cherry picked from commit 101a7622fe)
2020-05-01 11:04:59 +01:00
Yabin Cui
3f7e2270e6 Merge "Switch to clang-r383902 (11.0.1)." am: 74d25e39f0
Change-Id: I3e1021d885db2ba9bc00b55f59830b57333a2641
2020-05-01 05:42:49 +00:00
Yabin Cui
74d25e39f0 Merge "Switch to clang-r383902 (11.0.1)." 2020-05-01 05:28:39 +00:00
Dan Willemsen
e77773e2eb Disallow OUT_DIR on the command line am: 6dfe30a5e2
Change-Id: I36f017bf040a5d0d0ef0ee3dd0fe2917c88b34df
2020-05-01 04:52:59 +00:00
Dan Willemsen
6dfe30a5e2 Disallow OUT_DIR on the command line
By the time we do argument parsing, we've already written to $OUT_DIR or
the default, so don't allow overriding the output directory on the
command line.

Test: m OUT_DIR=newdir
Change-Id: I6f8c07cbef3a71d393b766dc5a01ae9c3df8631c
2020-05-01 02:23:31 +00:00
Treehugger Robot
ff08454c17 Merge "[cc_fuzz] Collect shared deps by name, not by module." am: c57d39cade
Change-Id: I330e7c304e599e92e2cd7e5e04202ccdadda9a30
2020-04-30 22:42:40 +00:00
Treehugger Robot
c57d39cade Merge "[cc_fuzz] Collect shared deps by name, not by module." 2020-04-30 22:26:22 +00:00
Jaewoong Jung
9b8df28178 Merge "Add defaults support to runtime_resource_overlay." am: 32335f90b1
Change-Id: Ic71aaf5cb02e701a591a4aa45afe111f0c8ca626
2020-04-30 18:04:28 +00:00
Jaewoong Jung
32335f90b1 Merge "Add defaults support to runtime_resource_overlay." 2020-04-30 17:43:37 +00:00
Ivan Lozano
13979aeb97 Merge "Provide 32-bit and 64-bit Rust libs by default." am: a812062d0d
Change-Id: Iff2dcc04830819c099138b6d882be3d14a7d607e
2020-04-30 15:26:32 +00:00
Ivan Lozano
a812062d0d Merge "Provide 32-bit and 64-bit Rust libs by default." 2020-04-30 15:14:53 +00:00
Ulya Trafimovich
50c4a4b19f Use two-column format for PRODUCT_BOOT_JARS components.
The first component is the apex name, or a special name "platform"
if the boot jar is a platform jar rather than a part of some apex.
This is a prerequisite change for moving core-icu4j to a separate
com.android.i18n apex.

Old one-column format is still supported, but all unqualified
components of PRODUCT_BOOT_JARS get "platform:" prepended to them
after reading the product makefiles.

Test: aosp_walleye-userdebug boots
Bug: 138994281
Change-Id: Ic229159fdcdaf6182210a53b63850a389dd786fc
2020-04-30 14:42:32 +01:00
Evgenii Stepanov
19ff3c9bb8 [soong] Zero and pattern initialization of heap memory.
Bug: 155227507
Test: build with and without MALLOC_PATTERN_FILL_CONTENTS, MALLOC_ZERO_CONTENTS
Change-Id: I79a675e1b20897e8f88e89b1b2d6758e8b91f0be
2020-04-29 15:33:07 -07:00
Treehugger Robot
1486c8a973 Merge changes I7bc54dc4,I4e9bfebd am: b407131a0e
Change-Id: I5849ce2a040f3319e5cb9d270bb9d26bff38ae82
2020-04-29 21:42:20 +00:00
Treehugger Robot
b407131a0e Merge changes I7bc54dc4,I4e9bfebd
* changes:
  java_sdk_library: Correct stubs source generation classpath
  Fix definition of android_stubs_current in sdk tests
2020-04-29 21:31:21 +00:00