StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,786 Commits 1 Branch 0 Tags
e66dbf873488f8c15f50ce092e40e482e2406515
Commit Graph

17786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
e66dbf8734 Merge "Revert "m <apex_name>-deps-info prints the internal/external deps of the APEX"" am: 8ea6bc4a05 am: 8298e7fd87 
Change-Id: Icc7659349d6ea6840543c76ff3e1dd16816b2f36
 2020-01-09 02:34:03 +00:00
Jiyong Park
8298e7fd87 Merge "Revert "m <apex_name>-deps-info prints the internal/external deps of the APEX"" 
am: 8ea6bc4a05

Change-Id: Ic3e2bd8ecda6d8f12355c61cd1fcc25804e22b38
 2020-01-08 18:22:41 -08:00
Jiyong Park
8ea6bc4a05 Merge "Revert "m <apex_name>-deps-info prints the internal/external deps of the APEX"" 2020-01-09 02:20:42 +00:00
Jiyong Park
4513f703f9 Revert "m <apex_name>-deps-info prints the internal/external deps of the APEX" 
This reverts commit 114ff53f5e.

Reason for revert: broke cf_x86_phone-userdebug_coverage 

Change-Id: I7221fd0b0baee5407a7322240c170aef8e549e4d
 2020-01-09 02:05:18 +00:00
Automerger Merge Worker
ff17b7015a Merge "jacoco correctly gathers info from APK-in-APEX" am: 36746d21a3 am: 5f1e8d6f19 
Change-Id: Ic0ded132eeb1035a8606724500e2b96cf28093d8
 2020-01-09 01:05:01 +00:00
Automerger Merge Worker
00cdc4a80f Merge "m <apex_name>-deps-info prints the internal/external deps of the APEX" am: 573326a8ce am: ef9f93cfac 
Change-Id: I6f98e5cbe3410cf3d88268bc905ec4a34e958e30
 2020-01-09 01:04:51 +00:00
Jiyong Park
5f1e8d6f19 Merge "jacoco correctly gathers info from APK-in-APEX" 
am: 36746d21a3

Change-Id: I1d33020f31bd5309d927ec6f861fbd4e7d139209
 2020-01-08 16:53:05 -08:00
Jiyong Park
ef9f93cfac Merge "m <apex_name>-deps-info prints the internal/external deps of the APEX" 
am: 573326a8ce

Change-Id: I977b34ab015f9f5fab336987c928d1fad9110c4f
 2020-01-08 16:49:39 -08:00
Treehugger Robot
36746d21a3 Merge "jacoco correctly gathers info from APK-in-APEX" 2020-01-09 00:45:11 +00:00
Treehugger Robot
573326a8ce Merge "m <apex_name>-deps-info prints the internal/external deps of the APEX" 2020-01-09 00:44:13 +00:00
Automerger Merge Worker
6e024b5da9 Merge "Define a make variable for merged compat config." am: 62c085d7fe am: 950a589fe4 
Change-Id: I55db69a4e1a32735f170119086e24184d9d2f8c4
 2020-01-08 22:45:35 +00:00
Mathew Inwood
950a589fe4 Merge "Define a make variable for merged compat config." 
am: 62c085d7fe

Change-Id: I7d32d09866265a6a89ec1160fdff7c00d7948f26
 2020-01-08 14:01:40 -08:00
Treehugger Robot
62c085d7fe Merge "Define a make variable for merged compat config." 2020-01-08 21:26:23 +00:00
Automerger Merge Worker
34187e47ca Merge "Include jacoco in the ART boot image if EMMA_INSTRUMENT_FRAMEWORK=true." am: 11e1ae025f am: 9425c8c78c 
Change-Id: Ib56da7c90a7077050b29b0ebaecf0718327d625d
 2020-01-08 11:30:56 +00:00
Automerger Merge Worker
3e484c30fb Merge "Move generation of the dexpreopt tool paths into Soong." am: 46f60291f3 am: 0233e754e8 
Change-Id: If6c6d148ad03d20cf9643c86b00db2e1aa59d0f8
 2020-01-08 11:30:37 +00:00
Mathew Inwood
653c78a909 Define a make variable for merged compat config. 
This allows it to be added to the dist target.

Test: m dist
Change-Id: I1d913577f43a2ba3cb134ed35a7c98be76da2bd1
 2020-01-08 11:24:58 +00:00
Ulyana Trafimovich
9425c8c78c Merge "Include jacoco in the ART boot image if EMMA_INSTRUMENT_FRAMEWORK=true." 
am: 11e1ae025f

Change-Id: Iae1abf9615bc7aa0ac1bb76450dda49c510e38eb
 2020-01-08 03:03:14 -08:00
Martin Stjernholm
0233e754e8 Merge "Move generation of the dexpreopt tool paths into Soong." 
am: 46f60291f3

Change-Id: If56caa31ed5ae470a4ff67ca42937c9da0c26cf8
 2020-01-08 03:02:16 -08:00
Ulyana Trafimovich
11e1ae025f Merge "Include jacoco in the ART boot image if EMMA_INSTRUMENT_FRAMEWORK=true." 2020-01-08 10:58:24 +00:00
Martin Stjernholm
46f60291f3 Merge "Move generation of the dexpreopt tool paths into Soong." 2020-01-08 10:40:28 +00:00
Jiyong Park
618922e510 jacoco correctly gathers info from APK-in-APEX 
This change fixes a bug that jacoco-report-classes-all.jar does not
include info for APK-in-APEX such as the MediaProvider apk in
com.android.mediaprovider APEX.

Firstly, LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR is correctly set also for
the APKs included in APEXes. Secondly, the Make modules for the embedded
APKs are now built with soong_app_prebuilt.mk to correctly import the
jacoco file into the Make world.

Bug: 147296855
Test: execute the following command in internal master.
$ choosecombo cf_x86_phone userdebug
$ NINJA_ARGS="-t path out/target/product/vsoc_x86/jacoco-report-classes-all.jar out/target/common/obj/ETC/MediaProvider.com.android.mediaprovider_intermediates/jacoco-report-classes.jar" EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true m
The result shows that there is a path as follows:
out/target/product/vsoc_x86/jacoco-report-classes-all.jar
out/target/product/vsoc_x86/apex/com.android.mediaprovider/priv-app/MediaProvider/MediaProvider.apk
out/target/product/vsoc_x86/obj/ETC/MediaProvider.com.android.mediaprovider_intermediates/package.apk
out/target/common/obj/ETC/MediaProvider.com.android.mediaprovider_intermediates/jacoco-report-classes.jar

Change-Id: I52d11534a34eb35219bfafca4453e75a1b701c0e
 2020-01-08 14:49:31 +09:00
Automerger Merge Worker
89ec3745bb Merge "vibrator: use package as name" am: 4b662e4d3b am: bd7203e66d 
Change-Id: Ib26e5eb1880c5a1a5235c769021fbe1fa03b20c7
 2020-01-07 23:07:40 +00:00
Steven Moreland
bd7203e66d Merge "vibrator: use package as name" 
am: 4b662e4d3b

Change-Id: I361b82925978469ecac6afb5e3fccf7bdbbd2b3c
 2020-01-07 14:48:38 -08:00
Steven Moreland
4b662e4d3b Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Automerger Merge Worker
88f36d7689 Merge "Support sampling PGO profiles" am: 563e3a4f95 am: e8c2eb1f83 
Change-Id: I80316b5ca00a50fe7517512adf5417a79d85fa0f
 2020-01-07 22:29:15 +00:00
Yi Kong
e8c2eb1f83 Merge "Support sampling PGO profiles" 
am: 563e3a4f95

Change-Id: I08c0936c28ae8b6e64f946b242801e96e6a7a292
 2020-01-07 14:21:12 -08:00
Yi Kong
563e3a4f95 Merge "Support sampling PGO profiles" 2020-01-07 22:18:12 +00:00
Automerger Merge Worker
9b47a016ab Delay invalid sdk_version error for AllowMissingDependencies am: 07c8856904 am: 400665159a 
Change-Id: Id98a2f3bba00c7a21ab676fd22b9fef9976f7a9b
 2020-01-07 20:33:27 +00:00
Colin Cross
400665159a Delay invalid sdk_version error for AllowMissingDependencies 
am: 07c8856904

Change-Id: I166f7174b51c59b152123b5cdf7fd5ba464307d2
 2020-01-07 12:19:16 -08:00
Colin Cross
07c8856904 Delay invalid sdk_version error for AllowMissingDependencies 
Unbundled builds set AllowMissingDependencies and attempt to use
prebuilts for some jars.  Delay the errors for missing jars for
modules with invalid sdk_version values in unbundled builds so
that they only block the build if those modules are built.

Also fix some error messages to show the original sdk_version
value.

Bug: 146513037
Test: m TARGET_BUILD_APPS=Camera2
Change-Id: I1812ef6dc80895f7a2162a8bdbf2c5067755e9a0
 2020-01-07 20:14:14 +00:00
Martin Stjernholm
c52aaf11d0 Move generation of the dexpreopt tool paths into Soong. 
The dexpreopt global config is now split into the part that is generated
from make (in build/make/core/dex_preopt_config.mk) and the part that is
generated from Soong. Since the goal is to generate the dex2oat path from
Soong dependencies, the old GlobalConfig.Tools struct is simply repurposed
for the Soong generated config, although the intention is to allow more
settings to migrate from make to Soong, and hence from GlobalConfig to
GlobalSoongConfig.

Since the new dexpreopt_soong.config is written from a Soong-created ninja
rule, it doesn't need to be rewritten to out/soong/<device>/ like the old
make-created config file.

Test: m
Test: env USE_DEX2OAT_DEBUG=false m
  (check that out/soong/dexpreopt_soong.config points to dex2oat instead of dex2oatd)
Bug: 145934348

Change-Id: Ifd45c4a08e2ec55b86f4a93f0d85bd39cf2cf189
 2020-01-07 14:15:42 +00:00
Automerger Merge Worker
09ecf51657 Merge "Respect JIT-zygote config when generating boot image location." am: 99d522b5df am: 540d35006f 
Change-Id: I5434a38e4fdc5a429bc4f13ea8a4505445a56611
 2020-01-07 11:15:26 +00:00
Ulyana Trafimovich
540d35006f Merge "Respect JIT-zygote config when generating boot image location." 
am: 99d522b5df

Change-Id: I7810e1734b8e49047077720c6a5ab5c9e53a92c0
 2020-01-07 03:01:06 -08:00
Ulyana Trafimovich
99d522b5df Merge "Respect JIT-zygote config when generating boot image location." 2020-01-07 10:48:45 +00:00
Automerger Merge Worker
458321b216 Merge "Pass auto_gen_config setting in Android.bp to makefile" am: 13f30ae38c am: 75b879c30b 
Change-Id: I5ea23eb72f2f8ada15feb5b525c3f0ffbf26319f
 2020-01-07 08:21:56 +00:00
Dan Shi
75b879c30b Merge "Pass auto_gen_config setting in Android.bp to makefile" 
am: 13f30ae38c

Change-Id: I5154d020a016b27c08e966b55974d08dae50bed5
 2020-01-07 00:00:51 -08:00
Dan Shi
13f30ae38c Merge "Pass auto_gen_config setting in Android.bp to makefile" 2020-01-07 06:23:04 +00:00
Automerger Merge Worker
ae5c67e016 Merge changes from topic "carry_required" am: 64d5ccef7a am: 05d981334f 
Change-Id: I1f5650d60ec28bf4c6ba18bf0c597d68a5916e4b
 2020-01-07 04:19:41 +00:00
Automerger Merge Worker
823160f504 *RequiredModuleNames functions are available via Module interface am: 6a8cf5fab4 am: 3d0ec3d20b 
Change-Id: Ide9255b63b2a96ea9443f00df235905743f6a0a4
 2020-01-07 04:19:38 +00:00
Automerger Merge Worker
7f560b1cca Merge "Remove unused system_modules" am: 9a3f61cd43 am: 40a301a80e 
Change-Id: I46f65a7714362599edbc0251627b17e842ee2c6e
 2020-01-07 04:19:17 +00:00
Jiyong Park
05d981334f Merge changes from topic "carry_required" 
am: 64d5ccef7a

Change-Id: I825a9fa4cc330f2604de4807cb0f242fb8be1239
 2020-01-06 20:08:09 -08:00
Jiyong Park
3d0ec3d20b *RequiredModuleNames functions are available via Module interface 
am: 6a8cf5fab4

Change-Id: Ia3aa6bd2780f7770c2798c6ff95f0e826b1ea165
 2020-01-06 20:08:05 -08:00
Jiyong Park
40a301a80e Merge "Remove unused system_modules" 
am: 9a3f61cd43

Change-Id: If8f7d8c55caa7a842e84f1571b67a35cbe015f06
 2020-01-06 20:05:07 -08:00
Treehugger Robot
64d5ccef7a Merge changes from topic "carry_required" 
* changes:
  APEX carries required properties of its dependencies
  *RequiredModuleNames functions are available via Module interface
 2020-01-07 03:51:29 +00:00
Treehugger Robot
9a3f61cd43 Merge "Remove unused system_modules" 2020-01-07 03:51:09 +00:00
Dan Shi
2468d015fe Pass auto_gen_config setting in Android.bp to makefile 
Bug: none
Test: local test with fuzzy_fastboot
Change-Id: I2c62f6fb58737538ef9e1e9fcbe63e03dfa7ee91
 2020-01-06 16:21:10 -08:00
Automerger Merge Worker
42988b2d48 Merge changes from topic "blueprint_scoped_module_factories" am: e35ff4aeb3 am: d6f80608ae 
Change-Id: I8cd3ec2384e11639a7808125a6a0aa9e490be078
 2020-01-06 23:03:17 +00:00
Automerger Merge Worker
fd259c494d Use blueprint.EarlyModuleContext am: c34d2329b4 am: a5b7784ba6 
Change-Id: I85121ddbff667cc591675cbc32ca986fb919efde
 2020-01-06 23:03:13 +00:00
Colin Cross
d6f80608ae Merge changes from topic "blueprint_scoped_module_factories" 
am: e35ff4aeb3

Change-Id: Ic8e054d5e964fa37ce2bbac0d849dde1fb85e777
 2020-01-06 14:49:09 -08:00
Colin Cross
a5b7784ba6 Use blueprint.EarlyModuleContext 
am: c34d2329b4

Change-Id: Ie41ca741c76698c9f3eec3d086b1f8ed38c8750c
 2020-01-06 14:48:55 -08:00