openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
platform_build_soong/android
History
Paul Duffin a1aa7387f7 Remove duplicate component from sdk snapshot 
Previously, an sdk snapshot could contain the following:
* A java_sdk_library_import module, e.g. "foo" which creates component
  modules "foo.stubs", etc.
* A corresponding versioned module, e.g. "sdk_foo@current" which
  created component modules "sdk_foo@current.stubs", etc.
* An internal (to the sdk snapshot) java_import for one of "foo"'s
  components, e.g. "sdk_foo.stubs"
* A corresponding versioned module, e.g. "sdk_foo.stubs@current".

That causes a few problems:
1. The "foo.stubs" is duplicated.
2. The names of the components created by the versioned
   java_sdk_library_import are invalid, as they append the component's
   suffix to the version and not the name before the version.

The latter causes problems when building against prebuilts and fixing
that causes the generated snapshot to be invalid because it contains
duplicate definitions of the "sdk_foo.stubs@current" module. One
explicitly in the Android.bp file and one created by the
"sdk_foo@current" module.

Removing the duplicates from the snapshot causes errors as the name
generated by the snapshot for the component module, i.e.
"sdk_foo.stubs@current" does not match the name generated by the
"sdk_foo@current", i.e. "sdk_foo@current.stubs".

This change fixes them together.

Bug: 179354495
Test: m nothing
Change-Id: I515f235fe21755b5275af12366e96c24c94c0273
 		2021-06-23 17:46:50 +01:00
..
soongconfig Fix nested properties in soong config structs 2021-03-05 17:26:37 -08:00
Android.bp Add license modules to the sdk 2021-05-11 08:28:49 +01:00
android_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
androidmk.go Switch Effective_license_text from []string to Paths 2021-05-11 08:24:59 +01:00
androidmk_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
apex.go Make CopyDirectlyInAnyApex match the documentation 2021-05-27 13:13:17 -07:00
apex_test.go Record the actual APEXes that a module is part of. 2021-05-20 17:36:22 +01:00
api_levels.go platform/build/soong - S is now 31 2021-06-01 06:49:05 -06:00
arch.go Define a narrower context for getting arch props 2021-05-14 15:14:40 -04:00
arch_list.go [arm64] Build NDK with PAuth and BTI 2021-01-26 08:15:07 +01:00
arch_test.go Add bp2build arch-specific paths mutator 2021-04-21 18:21:50 -04:00
bazel.go bp2build: build //external/scudo/... 2021-05-13 06:25:49 +00:00
bazel_handler.go Make @soong_injection usable in standalone builds. 2021-05-11 16:54:29 +02:00
bazel_handler_test.go Make @soong_injection usable in standalone builds. 2021-05-11 16:54:29 +02:00
bazel_paths.go Handle the version_script property. 2021-04-30 16:46:41 +02:00
bazel_test.go bp2build: add allowlist for package-level conversions. 2021-03-24 02:27:19 -04:00
config.go Make copyBootJarsToPredefinedLocations simpler and less fragile 2021-06-16 03:06:35 +01:00
config_test.go Fix writing soong.variables . 2021-03-17 16:35:13 +01:00
csuite_config.go Convert android/csuite_config_test.go to test fixtures 2021-03-17 16:18:17 +00:00
csuite_config_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
deapexer.go Simplify deapexer support 2021-06-21 10:54:22 +01:00
defaults.go Revert^2 "Add ability to declare licenses in soong." 2021-01-06 20:48:24 -08:00
defaults_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
defs.go Move android package on top of remotexec 2021-03-18 16:17:34 -07:00
depset_generic.go Reimplement DepSet as a wrapper around a generic implementation 2020-12-07 12:27:50 -08:00
depset_paths.go Reimplement DepSet as a wrapper around a generic implementation 2020-12-07 12:27:50 -08:00
depset_test.go Reimplement DepSet as a wrapper around a generic implementation 2020-12-07 12:27:50 -08:00
deptag.go Annotate dependency tags for dependencies of installed files 2020-11-23 18:06:08 -08:00
deptag_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
expand.go Fix android.Expand and ninja escaping 2019-07-11 14:52:17 -07:00
expand_test.go Revert "Make lots of tests run in parallel" 2020-10-09 18:34:24 -07:00
filegroup.go Incorporate filegroups into mixed builds. 2021-04-19 15:50:20 -04:00
fixture.go Add PrepareForDebug_DO_NOT_SUBMIT 2021-04-21 10:16:31 +01:00
fixture_test.go Remove FixturePreparer.Extend() 2021-04-01 10:33:20 +01:00
hooks.go Add SrcPath to InstallHookContext 2020-06-04 01:26:16 +01:00
image.go Add debug ramdisk variant. 2021-04-29 22:58:17 +09:00
license.go Switch Effective_license_text from []string to Paths 2021-05-11 08:24:59 +01:00
license_kind.go Revert^2 "Add ability to declare licenses in soong." 2021-01-06 20:48:24 -08:00
license_kind_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
license_sdk_member.go Add license modules to the sdk 2021-05-11 08:28:49 +01:00
license_test.go Add baseline test for license with sdk 2021-05-11 08:24:59 +01:00
licenses.go Add license modules to the sdk 2021-05-11 08:28:49 +01:00
licenses_test.go Switch Effective_license_text from []string to Paths 2021-05-11 08:24:59 +01:00
makefile_goal.go Remove AndroidMkExtraFootersFunc entries param. 2020-12-07 10:23:54 -08:00
makevars.go Add a new SingletonModule type 2021-01-07 17:19:27 -08:00
metrics.go Collect metrics from inside soong_build 2020-02-25 20:50:00 +00:00
module.go Merge changes from topic "far-dep-exists" into sc-dev 2021-05-22 12:54:47 +00:00
module_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
mutator.go Add bp2build arch-specific paths mutator 2021-04-21 18:21:50 -04:00
mutator_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
namespace.go getNamespacesToSearchForModule to use blueprint.Namespace 2020-12-21 18:40:53 +00:00
namespace_test.go Add TestingBuildParams.RelativeToTop() 2021-03-22 22:09:53 +00:00
neverallow.go more no include_dir 2021-04-27 18:03:55 +00:00
neverallow_test.go start eating include_dirs from both ends 2021-04-27 02:56:03 +00:00
ninja_deps.go Store ninja file deps from PackageVarContext in the config 2020-11-17 10:50:19 -08:00
ninja_deps_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
notices.go Make a soong-only copy of generate-notice-files.py 2020-03-03 13:50:53 -08:00
onceper.go Convert droidstubs to android.RuleBuilder 2019-07-18 14:28:14 -07:00
onceper_test.go Revert "Make lots of tests run in parallel" 2020-10-09 18:34:24 -07:00
override_module.go Add GetEmbeddedPrebuilt and IsModulePrebuilt 2021-04-28 14:02:04 +01:00
package.go Add error handling to test fixtures 2021-03-02 20:17:19 +00:00
package_ctx.go Move android package on top of remotexec 2021-03-18 16:17:34 -07:00
package_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
packaging.go Generate linker config with packaged items. 2021-05-11 11:56:54 +09:00
packaging_test.go Merge "Fix PackagingBase.CopyDepsToZip" 2021-03-23 04:21:38 +00:00
path_properties.go Add bp2build arch-specific paths mutator 2021-04-21 18:21:50 -04:00
path_properties_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
paths.go Add support for converting OptionalPath to Paths 2021-05-13 12:40:08 +01:00
paths_test.go Add support for converting OptionalPath to Paths 2021-05-13 12:40:08 +01:00
phony.go Refactor 'in_make' to mean Kati is not skipped. 2020-11-23 00:29:18 -05:00
prebuilt.go Add GetEmbeddedPrebuilt and IsModulePrebuilt 2021-04-28 14:02:04 +01:00
prebuilt_build_tool.go SOONG_* variables are emitted only for the BuildOS variants 2020-12-17 19:31:17 +09:00
prebuilt_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
proto.go Pass pctx and ctx to NewRuleBuilder 2020-12-01 16:22:16 -08:00
queryview.go queryview: fix depfile and incrementality. 2021-03-30 12:22:12 +00:00
register.go Register bp2build module types even outside generation 2021-03-31 12:26:01 -04:00
rule_builder.go Add validations to RuleBuilderCommand 2021-04-21 11:46:50 -07:00
rule_builder_test.go Add validations to RuleBuilderCommand 2021-04-21 11:46:50 -07:00
sandbox.go cd to / before running soong_build . 2021-03-03 09:14:22 +01:00
sdk.go Remove duplicate component from sdk snapshot 2021-06-23 17:46:50 +01:00
sdk_version.go ApiLevel of "" and "core_platform" is FutureApiLevel 2021-04-15 16:53:23 +09:00
singleton.go Add symlink_outputs support to Soong. 2020-10-19 01:26:50 -04:00
singleton_module.go Add a new SingletonModule type 2021-01-07 17:19:27 -08:00
singleton_module_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
soong_config_modules.go Add conditions_default for soong config variables. 2021-01-21 14:25:20 -05:00
soong_config_modules_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
test_asserts.go Add new stub_only_static_libs attr for sdk_library 2021-04-22 10:20:13 +01:00
test_suites.go Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList 2021-03-16 16:52:56 -07:00
testing.go Improve error reporting when a rule cannot be found 2021-06-16 10:03:21 +00:00
util.go Add FilterListPred. 2021-03-28 22:06:33 +01:00
util_test.go Add FilterListPred. 2021-03-28 22:06:33 +01:00
variable.go Merge "Remove draft API support." am: 7548b1ad05 am: 0ccb169046 am: c1499a90e2 2021-04-16 00:27:22 +00:00
variable_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
visibility.go Simplify preparers now that tests use consistent registration order 2021-03-09 14:14:48 +00:00
visibility_test.go Remove uses of FixtureFactory from android package 2021-03-22 18:31:53 +00:00
writedocs.go Fix writedocs. 2021-03-11 08:37:01 +01:00