Nicolas Geoffray
b60ce369b3
Merge "Don't return null for an interface type." am: 56e0290551
...
am: 6a1ea2e8a3
2019-02-25 22:08:07 -08:00
Sasha Smundak
754b5a313d
Merge "Handle LOCAL_MODULE_PATH assignment for android_test modules" am: 9ce7e58c04
...
am: f5d316b6ef
2019-02-25 21:57:49 -08:00
Nicolas Geoffray
63ab163d56
Merge "Support for install multiple boot images." am: d79df83b28
...
am: 5300094ca7
2019-02-25 20:10:23 -08:00
Xin Li
4e61f4264d
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
...
am: 985fea9dae
2019-02-25 17:15:03 -08:00
Xin Li
ec88357ac3
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: ced438cafc
2019-02-25 16:10:22 -08:00
Jaewoong Jung
c7ab1704e3
Merge "Split up Soong build doc." am: e608a51b06
...
am: 1d61042690
2019-02-25 08:09:45 -08:00
Nicolas Geoffray
6a1ea2e8a3
Merge "Don't return null for an interface type."
...
am: 56e0290551
2019-02-24 13:50:04 -08:00
Nicolas Geoffray
56e0290551
Merge "Don't return null for an interface type."
2019-02-24 21:42:38 +00:00
Sasha Smundak
f5d316b6ef
Merge "Handle LOCAL_MODULE_PATH assignment for android_test modules"
...
am: 9ce7e58c04
2019-02-24 12:37:59 -08:00
Treehugger Robot
9ce7e58c04
Merge "Handle LOCAL_MODULE_PATH assignment for android_test modules"
2019-02-24 20:27:24 +00:00
Nicolas Geoffray
27c7cc6c32
Don't return null for an interface type.
...
Otherwise we get:
internal error: panic in GenerateBuildActions for singleton dex_bootjars
interface conversion: interface is nil, not android.WritablePath
Test: build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I9d8484994d1b5120f0187861a8acaf20e94827f6
2019-02-24 16:04:52 +00:00
Nicolas Geoffray
5300094ca7
Merge "Support for install multiple boot images."
...
am: d79df83b28
2019-02-24 05:46:48 -08:00
Nicolas Geoffray
d79df83b28
Merge "Support for install multiple boot images."
2019-02-24 13:37:01 +00:00
Alex Light
749642bacd
Merge "Don't use stubs for host apexs" am: e91a078271
...
am: 0db86c9eef
2019-02-22 20:38:49 -08:00
Colin Cross
edc6b9c1e0
Pass DEXPREOPT_BOOT_JARS_MODULES to Make am: 9be4152c21
...
am: 2b34ef2fd3
2019-02-22 20:32:01 -08:00
Colin Cross
d3a73010f9
Refactor dexpreopt_bootjars.go to prepare for multiple boot images am: 44df581457
...
am: ac405aa805
2019-02-22 20:31:37 -08:00
Colin Cross
d123cd7459
Make RuleBuilder methods take Paths am: 69f59a3327
...
am: fafab5c1ec
2019-02-22 20:29:33 -08:00
Xin Li
985fea9dae
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
2019-02-23 00:39:18 +00:00
Sasha Smundak
f7ed0513e9
Handle LOCAL_MODULE_PATH assignment for android_test modules
...
Many Android.mk files for the CTS tests have
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
statement. This can be dropped during the conversion to blueprint
files.
Also, ignore the assignments to obsolete LOCAL_CTS_TEST_PACKAGE
variable.
Fixes: 125405331
Test: Internal tests, selectively run androidmk on Android.mk's in cts/
directory
Change-Id: I2ed88acd3c8837f96b84be6eb7c7b9b0b5405f57
2019-02-22 15:10:08 -08:00
Jaewoong Jung
1d61042690
Merge "Split up Soong build doc."
...
am: e608a51b06
2019-02-22 07:54:44 -08:00
Jaewoong Jung
e608a51b06
Merge "Split up Soong build doc."
2019-02-22 15:42:49 +00:00
Nicolas Geoffray
72892f1035
Support for install multiple boot images.
...
Bug: 119800099
Test: m && /system/framework/arm/apex*.art files exist
Change-Id: I8b708a0c495193e5455e03eaa575ce55a482a95d
2019-02-22 15:37:48 +00:00
Alex Light
0db86c9eef
Merge "Don't use stubs for host apexs"
...
am: e91a078271
2019-02-21 17:46:52 -08:00
Treehugger Robot
e91a078271
Merge "Don't use stubs for host apexs"
2019-02-22 01:31:38 +00:00
Alex Light
49ae3d9819
Don't use stubs for host apexs
...
Host apexs don't have a system-image associated with them so we need
to include all libraries, including those with stubs.
Test: ./art/test/testrunner/run_build_test_target.py -j50 art-linux-bionic-x64-zipapex
Bug: 125417922
Change-Id: Ie76e6a34e8be1057b29e2e005597c3e4b5fb1f9c
2019-02-21 14:02:46 -08:00
Colin Cross
2b34ef2fd3
Pass DEXPREOPT_BOOT_JARS_MODULES to Make
...
am: 9be4152c21
2019-02-21 13:50:57 -08:00
Colin Cross
ac405aa805
Refactor dexpreopt_bootjars.go to prepare for multiple boot images
...
am: 44df581457
2019-02-21 12:06:29 -08:00
Xin Li
ced438cafc
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: Ie10bc45dbb1bbf96df17a89ecdf24b68da3ca6d5
2019-02-21 09:24:25 -08:00
Colin Cross
fafab5c1ec
Make RuleBuilder methods take Paths
...
am: 69f59a3327
2019-02-21 07:14:17 -08:00
Colin Cross
9be4152c21
Pass DEXPREOPT_BOOT_JARS_MODULES to Make
...
Make is not setting PreoptBootJars, pass the value computed in
Soong back to Make.
Test: m checkbuild
Change-Id: Ie3db926df9c5d6bf18db1003b95823c7566800a9
2019-02-20 22:06:30 -08:00
Colin Cross
44df581457
Refactor dexpreopt_bootjars.go to prepare for multiple boot images
...
Refactor dexpreopt_bootjars.go so that buildBootImage can be called
with a bootImageConfig to create rules to build the boot image in
preparation for building multiple boot images.
Test: m checkbuild
Change-Id: I7ba40a0988c8acbd6c1ee4e36f4bbb34fb4e2d24
2019-02-20 22:06:29 -08:00
Colin Cross
69f59a3327
Make RuleBuilder methods take Paths
...
There are no more Make paths being used in Soong now that
dexpreopting and hiddenapi are in Soong. Use the Path types
in the inputs to RuleBuilder, and fix all users of RuleBuilder.
This reapplies I886f803d9a3419a43b2cae412537645f94c5dfbf with
fixes to disable preopt for Soong-only builds when the global
dexpreopt.config doesn't exist.
Test: all soong tests
Test: m checkbuild
Change-Id: I4dae9ecd5de22f062f9478ec8f0747f099cf8190
2019-02-20 22:06:09 -08:00
Colin Cross
ec60a92074
Merge "Revert "Make RuleBuilder methods take Paths"" am: 501d7e594a
...
am: dc68f8826c
2019-02-20 21:12:56 -08:00
Colin Cross
dc68f8826c
Merge "Revert "Make RuleBuilder methods take Paths""
...
am: 501d7e594a
2019-02-20 21:08:41 -08:00
Colin Cross
501d7e594a
Merge "Revert "Make RuleBuilder methods take Paths""
2019-02-21 05:03:41 +00:00
Colin Cross
ab898dc4a4
Revert "Make RuleBuilder methods take Paths"
...
This reverts commit acdd694071
2019-02-21 05:03:00 +00:00
Colin Cross
fc2da332e9
Merge "Make RuleBuilder methods take Paths" am: 4bb6764de9
...
am: 4ebb84d392
2019-02-20 20:18:37 -08:00
Colin Cross
4ebb84d392
Merge "Make RuleBuilder methods take Paths"
...
am: 4bb6764de9
2019-02-20 20:14:31 -08:00
Colin Cross
4bb6764de9
Merge "Make RuleBuilder methods take Paths"
2019-02-21 04:06:18 +00:00
Jiyong Park
080f3699cf
Merge "Install external deps of an APEX" am: 1455d47788
...
am: e9c5455e5b
2019-02-20 16:38:53 -08:00
Colin Cross
d308a0223c
Merge "Fix typo when multiple BootImageProfiles specified" am: 55f8c42a7b
...
am: 5a32244ce7
2019-02-20 16:36:43 -08:00
Jiyong Park
e9c5455e5b
Merge "Install external deps of an APEX"
...
am: 1455d47788
2019-02-20 16:09:13 -08:00
Colin Cross
5a32244ce7
Merge "Fix typo when multiple BootImageProfiles specified"
...
am: 55f8c42a7b
2019-02-20 16:07:27 -08:00
Treehugger Robot
1455d47788
Merge "Install external deps of an APEX"
2019-02-21 00:02:08 +00:00
Sasha Smundak
dd36b0ccf3
Merge "Implement vts_config module" am: e344fb5fb1
...
am: a4f4607862
2019-02-20 15:45:08 -08:00
Jaewoong Jung
6c29688691
Split up Soong build doc.
...
Previously the build doc was a gigantic list of modules and properties,
which can be overwhelming to new users. This change breaks it up by
packages, so that it is easier to look up and feels more coherent.
Bug: 123521276
Test: m soong_docs
Change-Id: I1a1a331f4b4deb8782d698e9076098c5a27b9566
2019-02-20 15:43:06 -08:00
Treehugger Robot
55f8c42a7b
Merge "Fix typo when multiple BootImageProfiles specified"
2019-02-20 23:23:54 +00:00
Sasha Smundak
a4f4607862
Merge "Implement vts_config module"
...
am: e344fb5fb1
2019-02-20 15:01:41 -08:00
Dan Willemsen
9f2a63692c
Merge "Allow linking against SystemConfiguration framework on Mac" am: 11545323d2
...
am: f8aaa24575
2019-02-20 14:44:44 -08:00
Colin Cross
acdd694071
Make RuleBuilder methods take Paths
...
There are no more Make paths being used in Soong now that
dexpreopting and hiddenapi are in Soong. Use the Path types
in the inputs to RuleBuilder, and fix all users of RuleBuilder.
Test: all soong tests
Test: m checkbuild
Change-Id: I886f803d9a3419a43b2cae412537645f94c5dfbf
2019-02-20 14:23:37 -08:00
