Commit graph

18456 commits

Author SHA1 Message Date
Automerger Merge Worker
a00f6b6500 Merge "Merge CSV files generated by UnsupportedAppUsageProcessor." am: a35e3ffd96
Change-Id: I68d7f414762f2a480346eddc0c68ed6bbfaf92a0
2020-02-25 04:09:21 +00:00
Treehugger Robot
a35e3ffd96 Merge "Merge CSV files generated by UnsupportedAppUsageProcessor." 2020-02-25 04:01:52 +00:00
Automerger Merge Worker
79cdcc07db Merge "Output json without trailing whitespaces but with trailing newlines." am: 65b5b59664
Change-Id: I4640dc70d62c51caa96c4e563866f35d125a7683
2020-02-25 00:41:28 +00:00
Treehugger Robot
65b5b59664 Merge "Output json without trailing whitespaces but with trailing newlines." 2020-02-25 00:39:23 +00:00
Automerger Merge Worker
ec3f52684e Merge "Require apps built against the SDK to use JNI built against the NDK" am: 48c2f294a6
Change-Id: I5f07647df61b60e70246fca49cff02f44d5a2dd6
2020-02-25 00:35:20 +00:00
Colin Cross
48c2f294a6 Merge "Require apps built against the SDK to use JNI built against the NDK" 2020-02-25 00:21:07 +00:00
Martin Stjernholm
37fa32ce94 Output json without trailing whitespaces but with trailing newlines.
Makes them more editor friendly, primarily when copied into
system/linkerconfig/testdata/root.

Test: m
Test: No diff between apex_manifest_full.json in out/
  and in linkerconfig/testdata/root/
Bug: 140599044
Change-Id: I6dacdd4baa59e6d70586c4a6343b9b8fd1b574f6
2020-02-24 22:20:49 +00:00
Automerger Merge Worker
e2c17743e4 Merge "Add C++ Host support on sysprop_library" am: efbce1cace
Change-Id: Ic2bb23da592336787e268e729260b0ba286230db
2020-02-24 02:44:07 +00:00
Treehugger Robot
efbce1cace Merge "Add C++ Host support on sysprop_library" 2020-02-24 02:29:09 +00:00
Automerger Merge Worker
668db9de14 For legacy10 APEXes default target_sdk_version and min_sdk_version to 29 am: 5d600c9169
Change-Id: I61b995e7c1a8d874de60fe0e2cbbe0f677ac64a4
2020-02-24 01:21:06 +00:00
Nikita Ioffe
5d600c9169 For legacy10 APEXes default target_sdk_version and min_sdk_version to 29
Test: m com.android.conscrypt
Bug: 149733822
Change-Id: Ia863b5701716ef4022b470ee758368ea4fffb1d4
Merged-In: Ia863b5701716ef4022b470ee758368ea4fffb1d4
(cherry picked from commit db10c13bdf)
2020-02-22 17:33:28 +00:00
Automerger Merge Worker
f86541ab99 Merge "Allow compile_multilib to be specified on module exports" am: f9f6a91376
Change-Id: Id0b488c3fa5982ee797de00db024336454f49e6d
2020-02-22 10:20:24 +00:00
Treehugger Robot
f9f6a91376 Merge "Allow compile_multilib to be specified on module exports" 2020-02-22 10:07:43 +00:00
Colin Cross
094cde4430 Require apps built against the SDK to use JNI built against the NDK
Apps that expect to run on older platforms should use JNI libraries
that will also run on older platforms.  Require that apps that set
sdk_version have jni_libs modules that also set sdk_version, or
set jni_uses_platform_apis: true to bypass the check.

Fixes: 149591057
Test: app_test.go
Change-Id: I76b9b45fb5773bc4dfc10520108f4f3578723909
2020-02-21 14:54:31 -08:00
Automerger Merge Worker
10d46c9a54 Merge "Allow Linux hosts to use ubsan runtime sanitizers." am: 61f7a24cea
Change-Id: Iff7e990fe90dbcd1960eb8eab3120e90eda5514e
2020-02-21 21:23:24 +00:00
Ivan Lozano
61f7a24cea Merge "Allow Linux hosts to use ubsan runtime sanitizers." 2020-02-21 21:16:17 +00:00
Automerger Merge Worker
f4fa3fe81e Allow for setting a logging_parent for an Apex. am: 004d717158
Change-Id: I5b74fa459ba84c906a5d5060f90fba9ecc5898aa
2020-02-21 17:28:41 +00:00
Baligh Uddin
004d717158 Allow for setting a logging_parent for an Apex.
Test: go test ./... -test.v -run TestOverrideApex
BUG: 148198056
Change-Id: Ib3749e59f5e31903f2dbe75f86534738147a55ec
2020-02-21 16:59:26 +00:00
Paul Duffin
13ad94fce2 Allow compile_multilib to be specified on module exports
This is needed to allow the art-host-module-exports to restrict itself
to just managing the linux 64 bit version of the host tools as that is
the only variant that is currently supported by all host tools. This
greatly simplifies that process and allows us to make progress on the
unbundling.

Bug: 142935992
Test: m nothing
Change-Id: I62d016d97c2df73e5feecf912638f477fedd97c9
2020-02-21 09:01:08 +00:00
Automerger Merge Worker
44242ee450 Merge "Ensure consistent handling of generated headers/dirs" am: a0d58893fc
Change-Id: I50b47f8244a9c3c432b499b2ef730932794a83e9
2020-02-21 08:34:35 +00:00
Automerger Merge Worker
63f0e96c10 Merge "Do not add dependencies from disabled sdk variants to its members" am: 1c1c6ab46b
Change-Id: I352ae417ed60378f205f9c2358e63699f512a27b
2020-02-21 08:34:25 +00:00
Treehugger Robot
a0d58893fc Merge "Ensure consistent handling of generated headers/dirs" 2020-02-21 08:19:33 +00:00
Treehugger Robot
1c1c6ab46b Merge "Do not add dependencies from disabled sdk variants to its members" 2020-02-21 08:18:25 +00:00
Automerger Merge Worker
c40208d7e6 Merge "Add jni_uses_platform_api property to android_app" am: 1a9be9f3d0
Change-Id: I7fad0b69e24c6017dbf8d09d027cc86ba8e49200
2020-02-21 07:10:08 +00:00
Colin Cross
1a9be9f3d0 Merge "Add jni_uses_platform_api property to android_app" 2020-02-21 06:58:48 +00:00
Automerger Merge Worker
f789eab3c5 Merge "Add static_libs field to target.vendor" am: 5c50e7f7c4
Change-Id: I6afb4b56e82429280433ce436881a16e8822da07
2020-02-21 04:12:32 +00:00
Treehugger Robot
5c50e7f7c4 Merge "Add static_libs field to target.vendor" 2020-02-21 03:57:05 +00:00
Chong Zhang
ed5c14632a Add static_libs field to target.vendor
test: builds with a local Android.bp that uses target.vender.static_libs

Change-Id: Id1b70660ccab26025c280497916929d303d16aff
2020-02-20 15:21:38 -08:00
Automerger Merge Worker
c4682b44de Merge "Add minijail to whitelist.go" am: 3f561c692d
Change-Id: Icb06d4ab05df230b59769ccec381215761924d38
2020-02-20 23:02:03 +00:00
Lingfeng Yang
3f561c692d Merge "Add minijail to whitelist.go" 2020-02-20 22:51:16 +00:00
Automerger Merge Worker
d4fff11609 Merge "Enable bitwise-conditional-parentheses warning" am: 78620004fc
Change-Id: I2e8678c0e78ea4d97ac7bddac701f6916effd608
2020-02-20 22:11:26 +00:00
Chih-hung Hsieh
78620004fc Merge "Enable bitwise-conditional-parentheses warning" 2020-02-20 21:55:28 +00:00
Paul Duffin
5efd1985d1 Ensure consistent handling of generated headers/dirs
The list of exported generated headers are all expected to be within
one of the exported generated include dirs. Previously, that was not
the case as ExportedGeneratedIncludeDirs was suitable for extracting
to common properties (which changes the output location) and
exportedGeneratedHeaders was not.

This would cause a problem if there was only one variant. In that case
the ExportedGeneratedIncludeDirs would be treated as a common property
and placed in include_gen/<x> directory while exportedGeneratedHeaders
would be treated as an arch specific property and placed in
<arch>/include_gen/<x>.

Bug: 142935992
Test: m nothing
Change-Id: Idf82a5ca551b44ec31971c7ff3bd957a4c38f396
2020-02-20 21:52:02 +00:00
Paul Duffin
583bf7ebf7 Do not add dependencies from disabled sdk variants to its members
If an sdk variant is disabled (e.g. say windows) then it should not
add dependencies on corresponding sdk member variants as if those
variants have not been created then the build breaks unnecessarily.

This is needed to make progress on unbundling art which provides at
least one host tool (dex2oat) that is not supported on all platforms
and some (hiddenapi) that only produce 64 bit versions.
Initially, the art prebuilts will only support building 64 bit
versions of linux host tools.

Bug: 142935992
Test: m art-module-sdk art-module-host-exports art-module-test-exports
Change-Id: Idfbb40bb3cabc6eb731a2b38f045ed14f0a713cc
2020-02-20 21:51:52 +00:00
Automerger Merge Worker
563533c0e6 Merge changes from topic "soong_tests_ndk" am: 53fe467c67
Change-Id: I7b5109b80a8a74344b41c04dc8794ba381c90963
2020-02-20 21:01:26 +00:00
Automerger Merge Worker
8a9806b3b1 Move NDK test modules into cc/testing.go am: f28329de73
Change-Id: I5500dc262f1ee5cf96762b3b0161688666083531
2020-02-20 21:01:23 +00:00
Treehugger Robot
53fe467c67 Merge changes from topic "soong_tests_ndk"
* changes:
  Make apex use cc.GatherRequiredDepsForTests
  Move NDK test modules into cc/testing.go
2020-02-20 20:39:16 +00:00
Ivan Lozano
9ac32c7674 Allow Linux hosts to use ubsan runtime sanitizers.
Linux host prebuilts for UBSan runtime are available now, so we can
enable these. There's a bit more work to be done for Windows/Darwin
support, so that's left to another CL.

Bug: 148289941
Test: Build host binary with integer overflow sanitization enabled.
Test: ./art/test/testrunner/run_build_test_target.py art-linux-bionic-x64

Change-Id: Ie98979116fa3bb8accb23d1788adcc28330a9530
2020-02-20 20:27:35 +00:00
Artur Satayev
b5df8a04ad Merge CSV files generated by UnsupportedAppUsageProcessor.
Flow:
1. Annotation processor generates a CSV file per class as a CLASS_OUTPUT resource.
2. hiddenapi.go extracts individual .csv files and merges them into an index.csv file per module.
3. hiddenapi_singleton.go merges individual index.csv files into a combined .csv file.

In a follow up hiddenapi-index.csv would replace unsupportedappusage_index.csv

Bug: 145132366
Change-Id: I87d92f9c8d4b1cc1df526fc576ee3c2101116b58
Test: diff unsupportedappusage_index.csv hiddenapi-index.csv
2020-02-20 20:21:49 +00:00
Automerger Merge Worker
5d5b2d7484 Merge "Use flag names with merge_csv.py." am: 112045230d
Change-Id: If461c67adcc7c0f4aebdc91c6879dbbe1a27afd4
2020-02-20 19:32:04 +00:00
Treehugger Robot
112045230d Merge "Use flag names with merge_csv.py." 2020-02-20 19:17:19 +00:00
Automerger Merge Worker
504f279963 Merge "bpf progs depend on system/core/libcutils/include" am: 3a15b8973d
Change-Id: I864a3ce3236c29b5313e769df4da58c5196551ee
2020-02-20 16:34:35 +00:00
Automerger Merge Worker
e7f40ede4b Create manifest_utils library target. am: 3be82c00fe
Change-Id: Icd248828370618ae7c654f79e65f3a09338d1fd3
2020-02-20 16:34:21 +00:00
Maciej Żenczykowski
3a15b8973d Merge "bpf progs depend on system/core/libcutils/include" 2020-02-20 16:31:31 +00:00
Baligh Uddin
3be82c00fe Create manifest_utils library target.
This utility can also be used for parsing and
managing the Android Manifest for apex under
system/apex/apexer.

Test:
python manifest_fixer_test.py
python manifest_check_test.py

BUG: 148198056
Change-Id: Iffe465b5f36b2a3fbf81414d6f19e241c5f5648f
2020-02-20 15:58:00 +00:00
Lingfeng Yang
0f8c5b4ac8 Add minijail to whitelist.go
The latest version of crosvm refers to minijail as a separate crate:

2dae56768c%5E%21/#F1

The current version of minijail in aosp crosvm-master isn't a crate,
but minijail in aosp master is a crate and builds with crosvm.

This allows the latest version of crosvm to build in the Android tree
and use minijail in the same tree.

Change-Id: I2231149f1488727754430183d04072c5cc0f570a
2020-02-20 07:27:15 -08:00
Automerger Merge Worker
bd51a99225 Simplify visibility rules that include //visibility:public am: 44885e29d6
Change-Id: Ia189b5486bc51b3b6a399f1cde66a2030c70c557
2020-02-20 14:46:10 +00:00
Paul Duffin
44885e29d6 Simplify visibility rules that include //visibility:public
While it is invalid to mix //visibility:public with other rules in the
visibility property in a .bp file tt was possible, by overriding
defaults, to have //visibility:public mixed in with other rules in the
effective visibility rules. That caused problems when those effective
rules were used in an sdk snapshot.

This change replaces any set of rules that include //visibility:public
with just the //visibility:public rule. That simplifies those rules,
making them cheaper to process and ensures that the effective rules are
valid in the visibility property.

Adding test support required some refactoring of the
effectiveVisibilityRules(BaseModuleContext, ...) and underlying methods
to take a Config instead of BaseModuleContext as the tests do not have
access to BaseModuleContext.

Bug: 142935992
Test: m nothing - new tests failed without change, work with it
      Add dex2oat to art-module-host-exports, build it and check the
      generated Android.bp file in the snapshot to ensure the
	  visibility property for the dex2oat prebuilt does not mix
	  //visibility:public with other rules.
Change-Id: I08e7f0dcb40838d426fe88fedf69eae27b77473c
2020-02-20 11:41:17 +00:00
Chih-Hung Hsieh
5f78d55a0a Enable bitwise-conditional-parentheses warning
Bug: 148286937
Test: make
Change-Id: Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f
Merged-In: Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f
2020-02-20 00:58:41 -08:00
Inseob Kim
89db15dcab Add C++ Host support on sysprop_library
With Host_supported: true, C++ part of sysprop_library will create host
variant which can be used from host modules. As there are no native
system property support on host, libbase functions will be used instead.
Adding support on host will help reduce code complexity of other
host_supported modules.

Bug: 147708854
Test: m, sysprop_test, manually test host binary
Change-Id: I850d91fea298ef1a0c16c6a7a9ec1aca5cf37e69
2020-02-20 17:39:20 +09:00