Commit Graph

13197 Commits

Author SHA1 Message Date
Colin Cross
6479beeca0 Merge "Allow codename.fingerprint format for targetSdkVersion" am: e928452f30
am: 1a385d14ef

Change-Id: Ib5d0bb3b6501a3b1565a13d21c57cf5e1a601a03
2019-04-22 10:09:41 -07:00
Colin Cross
1a385d14ef Merge "Allow codename.fingerprint format for targetSdkVersion"
am: e928452f30

Change-Id: I474891969735933f98c3a09646c50efca57efff8
2019-04-22 10:04:30 -07:00
Colin Cross
e928452f30 Merge "Allow codename.fingerprint format for targetSdkVersion" 2019-04-22 16:48:35 +00:00
Colin Cross
19b9e855c9 Merge "Build framework.aidl in Soong" am: 8bf9bd9f91
am: 2e2967423a

Change-Id: I177c278e520177929aeb76fc1ce6f05ebc576a20
2019-04-21 10:38:53 -07:00
Colin Cross
2e2967423a Merge "Build framework.aidl in Soong"
am: 8bf9bd9f91

Change-Id: Iffe8b5a7b2d6ce06cb369e064374cc009eea1cc1
2019-04-21 10:29:42 -07:00
Colin Cross
8bf9bd9f91 Merge "Build framework.aidl in Soong" 2019-04-21 17:20:16 +00:00
Dan Willemsen
8a4c0da74d Add -jetifier to pom2mk and pom2bp am: 7fdab6eeec
am: fd9fa1a56e

Change-Id: Ifaa39849ef2d858dd63745e2a8a0b9e5587bbd66
2019-04-21 02:47:34 -07:00
Dan Willemsen
7a5552644f Fix soong_zip --help am: 7f276c6b77
am: 4d5508524d

Change-Id: I97f6562b52a44652a1ff51fc079595d8ee47997a
2019-04-21 02:47:22 -07:00
Dan Willemsen
fd9fa1a56e Add -jetifier to pom2mk and pom2bp
am: 7fdab6eeec

Change-Id: Ibbdf2b95a487eed5515e62706e01c0d6d9737715
2019-04-21 02:42:33 -07:00
Dan Willemsen
4d5508524d Fix soong_zip --help
am: 7f276c6b77

Change-Id: Ic92068e1f7d65baa161e45dce2460af502334b11
2019-04-21 02:42:21 -07:00
Dan Willemsen
7fdab6eeec Add -jetifier to pom2mk and pom2bp
Test: use pom2mk -jetifier to replace some hand-modified makefiles
Change-Id: I2a1988d0120fee1edf2d85c8b3294041840efe7c
2019-04-20 21:47:14 -07:00
Dan Willemsen
7f276c6b77 Fix soong_zip --help
It was not printing out the flag descriptions because it was using the
default FlagSet instead of the custom FlagSet when calling
PrintDefaults.

Test: soong_zip --help
Change-Id: I8a5705f8701ce0c05dde144b9a14962faa384e65
2019-04-20 21:45:51 -07:00
Sasha Smundak
a6cc184cfd Merge "Fix handling optimize.enabled from java_defaults" am: 36ab727c82
am: 2f65feddde

Change-Id: I9ba47791f33c2722140dcfa3ddfe2b649ee3d9bd
2019-04-19 23:39:00 -07:00
Sasha Smundak
2f65feddde Merge "Fix handling optimize.enabled from java_defaults"
am: 36ab727c82

Change-Id: I23a8d2e2dadf413597d59be9d43667bb7bd05193
2019-04-19 23:27:40 -07:00
Treehugger Robot
36ab727c82 Merge "Fix handling optimize.enabled from java_defaults" 2019-04-20 06:17:14 +00:00
Jiyong Park
48af68cf58 Merge "Ensure that PathsForModuleSrc works with prebuilts" am: 3ed757ab3a
am: 2b77cefa1b

Change-Id: I7766815b06d8673e98e8d3a97943c966c342f5f5
2019-04-19 21:06:14 -07:00
Yi Kong
a0ae8477b7 [automerger skipped] Switch to clang-r353983c
am: ac9e61536f -s ours
am skip reason: change_id I15f1db69de86ad8b9f2a0ae086fa2df87835948a with SHA1 09ecee7686 is in history

Change-Id: Id1a3c9e7b0b44b0b300f8dc6e714a55c5ec42ab5
2019-04-19 20:49:26 -07:00
Jiyong Park
2b77cefa1b Merge "Ensure that PathsForModuleSrc works with prebuilts"
am: 3ed757ab3a

Change-Id: I264499f517e8fa8501d75336ca97f1083fcad3b4
2019-04-19 20:44:17 -07:00
Jiyong Park
3ed757ab3a Merge "Ensure that PathsForModuleSrc works with prebuilts" 2019-04-20 02:40:19 +00:00
Dan Willemsen
1ddd50b92a Merge changes from topics "obsolete_broken_dup_copy_headers", "obsolete_broken_phony_targets" am: 49495ee63f
am: f8b4bdd07a

Change-Id: Idd9de9d427b01f69c0e63573126eb295d9a0b672
2019-04-19 17:18:10 -07:00
Yi Kong
7a3161c25b Merge "Switch to clang-r353983c" am: db52ce88b0
am: bafbdf4239

Change-Id: I50cd88d304d9a16496d9500a2506f5e7200cf2a0
2019-04-19 17:14:03 -07:00
Dan Willemsen
f8b4bdd07a Merge changes from topics "obsolete_broken_dup_copy_headers", "obsolete_broken_phony_targets"
am: 49495ee63f

Change-Id: Iaa35295b6e69383278c080090fa314eeff115bd1
2019-04-19 17:07:04 -07:00
Treehugger Robot
49495ee63f Merge changes from topics "obsolete_broken_dup_copy_headers", "obsolete_broken_phony_targets"
* changes:
  Obsolete BUILD_BROKEN_DUP_COPY_HEADERS
  Obsolete BUILD_BROKEN_PHONY_TARGETS
2019-04-19 23:56:14 +00:00
Yi Kong
bafbdf4239 Merge "Switch to clang-r353983c"
am: db52ce88b0

Change-Id: I80437802cdb52b22bad0e2c67f57b596cc75451a
2019-04-19 16:30:25 -07:00
Yi Kong
ac9e61536f Switch to clang-r353983c
Test: TreeHugger
Bug: 129712936
Change-Id: Ie1545f174017dbceab25a4e420c015230d74e97a
Merged-In: I15f1db69de86ad8b9f2a0ae086fa2df87835948a
(cherry picked from commit 09ecee7686)
2019-04-19 15:22:11 -07:00
Yi Kong
db52ce88b0 Merge "Switch to clang-r353983c" 2019-04-19 21:55:45 +00:00
Jesse Hall
a582948c3c [automerger skipped] Merge "Fix: HideFromMake is not registered to llndk_* module types" into qt-dev
am: 962462b203 -s ours
am skip reason: change_id I44e3668460448d79382617df61171b0ab5b4d98d with SHA1 5e676fe9f0 is in history

Change-Id: If25b3b912556df41481d4dc73967a4e0993b322a
2019-04-19 12:11:11 -07:00
Jiyong Park
f880e1e5c3 [automerger skipped] Fix: HideFromMake is not registered to llndk_* module types
am: a1bc838ce1 -s ours
am skip reason: change_id I44e3668460448d79382617df61171b0ab5b4d98d with SHA1 5e676fe9f0 is in history

Change-Id: I1b99f43a8a8f7bb141e179a3914ae8c7ba7c2fe3
2019-04-19 12:05:58 -07:00
Dan Willemsen
2fbb7571bf Obsolete BUILD_BROKEN_DUP_COPY_HEADERS
There are no remaining users.

Test: treehugger
Change-Id: If8719480f73a8fa009d9733479390d2abd4021b1
2019-04-19 11:22:27 -07:00
Jesse Hall
962462b203 Merge "Fix: HideFromMake is not registered to llndk_* module types" into qt-dev 2019-04-19 18:18:45 +00:00
Dan Willemsen
6097746769 Obsolete BUILD_BROKEN_PHONY_TARGETS
There are no remaining users.

Also mark BUILD_BROKEN_ANDROIDMK_EXPORTS and BUILD_BROKEN_ENG_DEBUG_TAGS
as deprecated in scripts/build_broken_logs.go

Test: treehugger
Change-Id: If7892bef1b9001f12a99565f886b395cf1985e70
2019-04-19 11:16:52 -07:00
Colin Cross
7a2b55a491 [automerger skipped] Merge "Get default sdk_test.go values from config" am: 9820aa6cc8
am: 44619bfa34 -s ours
am skip reason: change_id I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d with SHA1 901ea31b7c is in history

Change-Id: I586b1cb67877bccf4e66fb7ad81cc031bea57629
2019-04-19 10:37:07 -07:00
Colin Cross
44619bfa34 Merge "Get default sdk_test.go values from config"
am: 9820aa6cc8

Change-Id: I95da16462ea8c1d3d4eeeb6c0c8fb3b57d2dd059
2019-04-19 10:34:21 -07:00
Treehugger Robot
9820aa6cc8 Merge "Get default sdk_test.go values from config" 2019-04-19 17:13:29 +00:00
Yi Kong
09ecee7686 Switch to clang-r353983c
Test: TreeHugger
Bug: 129712936
Change-Id: I15f1db69de86ad8b9f2a0ae086fa2df87835948a
2019-04-19 16:23:18 +00:00
Jiyong Park
683c699acd Fix: PathsForModuleSrc does not work for a replaced dependency am: f2976304f7
am: 581569e4cc

Change-Id: I7fee54cf5aa62f5b58b88a4a04e600619b488806
2019-04-19 02:09:52 -07:00
Jiyong Park
581569e4cc Fix: PathsForModuleSrc does not work for a replaced dependency
am: f2976304f7

Change-Id: Id542e5aec1aa6ea0e69e6af0f93a3440885924d8
2019-04-19 02:04:49 -07:00
Jiyong Park
d4671111ef Ensure that PathsForModuleSrc works with prebuilts
prebuilt_test is amended to ensure
f2976304f7 is not broken.

PathsForModuleSrc is called to check if the file is from correct module
(either from source or prebuilt module)

Bug: 130627486
Test: m

Change-Id: Ic5f467fbc2837727df92102530687e967cd5529f
2019-04-19 17:57:33 +09:00
Jiyong Park
f2976304f7 Fix: PathsForModuleSrc does not work for a replaced dependency
PathsForModuleSrc does not work if a source module is replaced with a
prebuilt module. This is because the function uses GetDirectDepWithTag
with the name of the original source module. Since the dependency is
replaced and the prebuilt module has the name "prebuilt_<name>", the
search always fails.

Fixing this by re-implementing GetDirectDep* functions inside Soong
using VisitDirectDep.

Bug: 130627486
Test: m
Change-Id: I68d52668283c429d5e93c7f2c81f6a8db1f24893
2019-04-19 13:48:33 +09:00
Colin Cross
109328714f Allow codename.fingerprint format for targetSdkVersion
Use codename.fingerprint format for targetSdkVersion if it is unset
in the manifest and UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.

Test: manual
Bug: 130541924
Change-Id: I4e3b1274cc32038b00b292dc6d67559eb320e9e4
2019-04-18 16:05:37 -07:00
Dan Willemsen
16d929e1cf [automerger skipped] TARGET_FS_CONFIG_GEN is a list, not a single path
am: 6128b85885 -s ours
am skip reason: change_id Ic1f7d38239f3f805ca0723c24005d3e18a811870 with SHA1 54879d193e is in history

Change-Id: I7aaeb19bac7e05f8f6e50ed8b08877a7d7844d5e
2019-04-18 16:02:05 -07:00
TreeHugger Robot
3db7eb6e8b Merge "Get default sdk_test.go values from config" into qt-dev-plus-aosp 2019-04-18 22:35:30 +00:00
Jiyong Park
a1bc838ce1 Fix: HideFromMake is not registered to llndk_* module types
llndk_* module types are not initialized via cc.Module.Init(). As a
consequence, mutated properties like HideFromMake, etc. were not
registered and this caused problem when the mutated properties are set
by one of the mutators like the sanitizerMutator. Specifically, both
asan and non-asan variant of an llndk_header were both exported to Make
although HideFromMake was set to true for the non-asan variant.

Fixing this bug by explicitly registering BaseProperties struct which
contains the mutated properties.

Bug: 130652996
Test: Following works:
$ lunch aosp_cf_x86_pasan-userdebug
$ mkdir frameworks/native/test && mkdir frameworks/native/test/include
$ cat > frameworks/native/test/Android.bp
llndk_headers {
    name: "test_headers",
    export_include_dirs: ["include"],
}
^D
$ SANITIZE_TARGET='address' make

Change-Id: I44e3668460448d79382617df61171b0ab5b4d98d
Merged-In: I44e3668460448d79382617df61171b0ab5b4d98d
2019-04-18 14:41:51 -07:00
Dan Willemsen
6128b85885 TARGET_FS_CONFIG_GEN is a list, not a single path
Bug: 130787336
Test: m oemaids_header_gen oemaids_headers passwd group
Test: Set TARGET_FS_CONFIG_GEN to a list of paths
Change-Id: Ic1f7d38239f3f805ca0723c24005d3e18a811870
Merged-In: Ic1f7d38239f3f805ca0723c24005d3e18a811870
(cherry picked from commit 54879d193e)
2019-04-18 14:27:46 -07:00
Colin Cross
3047fa23da Build framework.aidl in Soong
Move the rules to build framework.aidl into Soong, and use it
when compiling aidl files with sdk_version: "current".

Also fixes incorrectly using the aidl includes exported by the
"framework" module when the proguardRaiseDep dependency was
added.

Bug: 130798034
Test: sdk_test.go
Change-Id: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
2019-04-18 13:51:58 -07:00
Dan Willemsen
9d1dc04e2d Merge "TARGET_FS_CONFIG_GEN is a list, not a single path" am: 3c4a9159c9
am: 8fa04304e7

Change-Id: I9e2450bfc99d592c2e272cb298fbc53fee112755
2019-04-18 12:53:35 -07:00
Dan Willemsen
8fa04304e7 Merge "TARGET_FS_CONFIG_GEN is a list, not a single path"
am: 3c4a9159c9

Change-Id: Ia352f2354235fae711d37a8f059ec01d2b0d8b5d
2019-04-18 12:48:20 -07:00
Treehugger Robot
3c4a9159c9 Merge "TARGET_FS_CONFIG_GEN is a list, not a single path" 2019-04-18 19:37:49 +00:00
Colin Cross
60405e50f8 Get default sdk_test.go values from config
This will help avoid merge conflicts between branches that have
additional default libraries.

Test: sdk_test.go
Change-Id: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
Merged-In: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
2019-04-18 12:35:16 -07:00
Colin Cross
901ea31b7c Get default sdk_test.go values from config
This will help avoid merge conflicts between branches that have
additional default libraries.

Test: sdk_test.go
Change-Id: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
2019-04-18 12:34:10 -07:00