Build updatable-bcp-packages.txt from prebuilts in sdk snapshot
Previously, the java_import and java_sdk_library_import modules did not make their permitted_packages available to the rule that generates the updatable-bcp-packages.txt file. This change corrects that. Bug: 193095050 Test: m nothing - Added unit tests, which all failed and then fixed the tests. Merged-In: If0706e4551a331b48d383123088e63924dded48b Change-Id: If0706e4551a331b48d383123088e63924dded48b (cherry picked from commit 630b11e9d4d63e5fabaa20adf5d1b1c81ede6681)
This commit is contained in:
parent
7b3e10a1c2
commit
dbcc29647a
|
@ -398,6 +398,7 @@ func TestPlatformBootclasspath_AlwaysUsePrebuiltSdks(t *testing.T) {
|
||||||
name: "foo",
|
name: "foo",
|
||||||
prefer: false,
|
prefer: false,
|
||||||
shared_library: false,
|
shared_library: false,
|
||||||
|
permitted_packages: ["foo"],
|
||||||
public: {
|
public: {
|
||||||
jars: ["sdk_library/public/foo-stubs.jar"],
|
jars: ["sdk_library/public/foo-stubs.jar"],
|
||||||
stub_srcs: ["sdk_library/public/foo_stub_sources"],
|
stub_srcs: ["sdk_library/public/foo_stub_sources"],
|
||||||
|
|
|
@ -1192,6 +1192,12 @@ type Import struct {
|
||||||
minSdkVersion android.SdkSpec
|
minSdkVersion android.SdkSpec
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var _ PermittedPackagesForUpdatableBootJars = (*Import)(nil)
|
||||||
|
|
||||||
|
func (j *Import) PermittedPackagesForUpdatableBootJars() []string {
|
||||||
|
return j.properties.Permitted_packages
|
||||||
|
}
|
||||||
|
|
||||||
func (j *Import) SdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {
|
func (j *Import) SdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {
|
||||||
return android.SdkSpecFrom(ctx, String(j.properties.Sdk_version))
|
return android.SdkSpecFrom(ctx, String(j.properties.Sdk_version))
|
||||||
}
|
}
|
||||||
|
|
|
@ -1991,6 +1991,12 @@ func sdkLibraryImportFactory() android.Module {
|
||||||
return module
|
return module
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var _ PermittedPackagesForUpdatableBootJars = (*SdkLibraryImport)(nil)
|
||||||
|
|
||||||
|
func (module *SdkLibraryImport) PermittedPackagesForUpdatableBootJars() []string {
|
||||||
|
return module.properties.Permitted_packages
|
||||||
|
}
|
||||||
|
|
||||||
func (module *SdkLibraryImport) Prebuilt() *android.Prebuilt {
|
func (module *SdkLibraryImport) Prebuilt() *android.Prebuilt {
|
||||||
return &module.prebuilt
|
return &module.prebuilt
|
||||||
}
|
}
|
||||||
|
|
|
@ -532,6 +532,12 @@ sdk_snapshot {
|
||||||
out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv
|
out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv
|
||||||
snapshot/hiddenapi/index.csv
|
snapshot/hiddenapi/index.csv
|
||||||
`, rule)
|
`, rule)
|
||||||
|
|
||||||
|
// Make sure that the permitted packages from the prebuilts end up in the
|
||||||
|
// updatable-bcp-packages.txt file.
|
||||||
|
rule = module.Output("updatable-bcp-packages.txt")
|
||||||
|
expectedContents := `'mybootlib\nmyothersdklibrary\n'`
|
||||||
|
android.AssertStringEquals(t, "updatable-bcp-packages.txt", expectedContents, rule.Args["content"])
|
||||||
}),
|
}),
|
||||||
snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot),
|
snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot),
|
||||||
snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot),
|
snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot),
|
||||||
|
|
Loading…
Reference in New Issue