From f8dcf5ead2046a8bf2cab479611c0ccb93ff5b89 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Tue, 16 Feb 2021 11:40:16 +0000 Subject: [PATCH] Make apex.updatable default to true. Update tests accordingly and add a new test case for this. Bug: 180375550 Test: Treehugger Change-Id: I835e189f4dae1e4bc79dce7bc59b7b9c7bd19fd9 --- apex/apex.go | 4 +- apex/apex_test.go | 120 ++++++++++++++++++++++++++++++++++++++++ apex/boot_image_test.go | 2 + apex/vndk_test.go | 2 + sdk/cc_sdk_test.go | 3 + sdk/java_sdk_test.go | 2 + 6 files changed, 131 insertions(+), 2 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index a4bdc639b..8f388c446 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -121,7 +121,7 @@ type apexBundleProperties struct { // Whether this APEX is considered updatable or not. When set to true, this will enforce // additional rules for making sure that the APEX is truly updatable. To be updatable, // min_sdk_version should be set as well. This will also disable the size optimizations like - // symlinking to the system libs. Default is false. + // symlinking to the system libs. Default is true. Updatable *bool // Whether this APEX is installable to one of the partitions like system, vendor, etc. @@ -1232,7 +1232,7 @@ var _ android.ApexBundleDepsInfoIntf = (*apexBundle)(nil) // Implements android.ApexBudleDepsInfoIntf func (a *apexBundle) Updatable() bool { - return proptools.Bool(a.properties.Updatable) + return proptools.BoolDefault(a.properties.Updatable, true) } // getCertString returns the name of the cert that should be used to sign this APEX. This is diff --git a/apex/apex_test.go b/apex/apex_test.go index af5fe0653..8ae663470 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -378,6 +378,7 @@ func TestBasicApex(t *testing.T) { "myjar", "myjar_dex", ], + updatable: false, } apex { @@ -478,6 +479,7 @@ func TestBasicApex(t *testing.T) { binaries: ["foo"], key: "myapex.key", file_contexts: ":myapex-file_contexts", + updatable: false, } cc_library_shared { @@ -671,6 +673,7 @@ func TestDefaults(t *testing.T) { apps: ["AppFoo"], rros: ["rro"], bpfs: ["bpf"], + updatable: false, } prebuilt_etc { @@ -739,6 +742,7 @@ func TestApexManifest(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, } apex_key { @@ -762,6 +766,7 @@ func TestBasicZipApex(t *testing.T) { key: "myapex.key", payload_type: "zip", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -811,6 +816,7 @@ func TestApexWithStubs(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib", "mylib3"], + updatable: false, } apex_key { @@ -1077,6 +1083,7 @@ func TestApexWithExplicitStubsDependency(t *testing.T) { name: "myapex2", key: "myapex2.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -1172,6 +1179,7 @@ func TestApexWithRuntimeLibsDependency(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -1234,6 +1242,7 @@ func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) { name: "com.android.runtime", key: "com.android.runtime.key", native_shared_libs: ["libc"], + updatable: false, } apex_key { @@ -1297,6 +1306,7 @@ func TestRuntimeApexShouldInstallHwasanIfHwaddressSanitized(t *testing.T) { name: "com.android.runtime", key: "com.android.runtime.key", native_shared_libs: ["libc"], + updatable: false, } apex_key { @@ -1382,6 +1392,7 @@ func TestApexDependsOnLLNDKTransitively(t *testing.T) { key: "myapex.key", use_vendor: true, native_shared_libs: ["mylib"], + updatable: false, `+tc.minSdkVersion+` } @@ -1447,6 +1458,7 @@ func TestApexWithSystemLibsStubs(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib", "mylib_shared", "libdl", "libm"], + updatable: false, } apex_key { @@ -1673,6 +1685,7 @@ func TestApexMinSdkVersion_DefaultsToLatest(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libx"], + updatable: false, } apex_key { @@ -1718,6 +1731,7 @@ func TestPlatformUsesLatestStubsFromApexes(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libx"], + updatable: false, } apex_key { @@ -1944,6 +1958,7 @@ func TestJavaStableSdkVersion(t *testing.T) { name: "myapex", java_libs: ["myjar"], key: "myapex.key", + updatable: false, } apex_key { name: "myapex.key", @@ -2254,6 +2269,7 @@ func TestFilesInSubDir(t *testing.T) { binaries: ["mybin"], prebuilts: ["myetc"], compile_multilib: "both", + updatable: false, } apex_key { @@ -2320,6 +2336,7 @@ func TestFilesInSubDirWhenNativeBridgeEnabled(t *testing.T) { }, compile_multilib: "both", native_bridge_supported: true, + updatable: false, } apex_key { @@ -2372,6 +2389,7 @@ func TestUseVendor(t *testing.T) { key: "myapex.key", native_shared_libs: ["mylib"], use_vendor: true, + updatable: false, } apex_key { @@ -2440,6 +2458,7 @@ func TestUseVendorNotAllowedForSystemApexes(t *testing.T) { name: "myapex", key: "myapex.key", use_vendor: true, + updatable: false, } apex_key { name: "myapex.key", @@ -2458,6 +2477,7 @@ func TestUseVendorFailsIfNotVendorAvailable(t *testing.T) { key: "myapex.key", native_shared_libs: ["mylib"], use_vendor: true, + updatable: false, } apex_key { @@ -2482,6 +2502,7 @@ func TestVendorApex(t *testing.T) { key: "myapex.key", binaries: ["mybin"], vendor: true, + updatable: false, } apex_key { name: "myapex.key", @@ -2528,6 +2549,7 @@ func TestVendorApex_use_vndk_as_stable(t *testing.T) { binaries: ["mybin"], vendor: true, use_vndk_as_stable: true, + updatable: false, } apex_key { name: "myapex.key", @@ -2589,6 +2611,7 @@ func TestApex_withPrebuiltFirmware(t *testing.T) { name: "myapex", key: "myapex.key", prebuilts: ["myfirmware"], + updatable: false, `+tc.additionalProp+` } apex_key { @@ -2617,6 +2640,7 @@ func TestAndroidMk_UseVendorRequired(t *testing.T) { key: "myapex.key", use_vendor: true, native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -2651,6 +2675,7 @@ func TestAndroidMk_VendorApexRequired(t *testing.T) { key: "myapex.key", vendor: true, native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -2682,6 +2707,7 @@ func TestAndroidMkWritesCommonProperties(t *testing.T) { key: "myapex.key", vintf_fragments: ["fragment.xml"], init_rc: ["init.rc"], + updatable: false, } apex_key { name: "myapex.key", @@ -2710,6 +2736,7 @@ func TestStaticLinking(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -2756,6 +2783,7 @@ func TestKeys(t *testing.T) { certificate: ":myapex.certificate", native_shared_libs: ["mylib"], file_contexts: ":myapex-file_contexts", + updatable: false, } cc_library { @@ -2810,6 +2838,7 @@ func TestCertificate(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, } apex_key { name: "myapex.key", @@ -2828,6 +2857,7 @@ func TestCertificate(t *testing.T) { name: "myapex_keytest", key: "myapex.key", file_contexts: ":myapex-file_contexts", + updatable: false, } apex_key { name: "myapex.key", @@ -2850,6 +2880,7 @@ func TestCertificate(t *testing.T) { name: "myapex", key: "myapex.key", certificate: ":myapex.certificate", + updatable: false, } apex_key { name: "myapex.key", @@ -2873,6 +2904,7 @@ func TestCertificate(t *testing.T) { key: "myapex.key", file_contexts: ":myapex-file_contexts", certificate: ":myapex.certificate", + updatable: false, } apex_key { name: "myapex.key", @@ -2895,6 +2927,7 @@ func TestCertificate(t *testing.T) { name: "myapex", key: "myapex.key", certificate: "testkey", + updatable: false, } apex_key { name: "myapex.key", @@ -2914,6 +2947,7 @@ func TestCertificate(t *testing.T) { key: "myapex.key", file_contexts: ":myapex-file_contexts", certificate: "testkey", + updatable: false, } apex_key { name: "myapex.key", @@ -2938,6 +2972,7 @@ func TestMacro(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib", "mylib2"], + updatable: false, } apex { @@ -3065,6 +3100,7 @@ func TestHeaderLibsDependency(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -3207,6 +3243,7 @@ func TestVndkApexCurrent(t *testing.T) { apex_vndk { name: "com.android.vndk.current", key: "com.android.vndk.current.key", + updatable: false, } apex_key { @@ -3263,6 +3300,7 @@ func TestVndkApexWithPrebuilt(t *testing.T) { apex_vndk { name: "com.android.vndk.current", key: "com.android.vndk.current.key", + updatable: false, } apex_key { @@ -3348,6 +3386,7 @@ func TestVndkApexVersion(t *testing.T) { key: "myapex.key", file_contexts: ":myapex-file_contexts", vndk_version: "27", + updatable: false, } apex_key { @@ -3415,12 +3454,14 @@ func TestVndkApexNameRule(t *testing.T) { name: "com.android.vndk.current", key: "myapex.key", file_contexts: ":myapex-file_contexts", + updatable: false, } apex_vndk { name: "com.android.vndk.v28", key: "myapex.key", file_contexts: ":myapex-file_contexts", vndk_version: "28", + updatable: false, } apex_key { name: "myapex.key", @@ -3446,6 +3487,7 @@ func TestVndkApexSkipsNativeBridgeSupportedModules(t *testing.T) { name: "com.android.vndk.current", key: "com.android.vndk.current.key", file_contexts: ":myapex-file_contexts", + updatable: false, } apex_key { @@ -3518,6 +3560,7 @@ func TestVndkApexWithBinder32(t *testing.T) { key: "myapex.key", file_contexts: ":myapex-file_contexts", vndk_version: "27", + updatable: false, } apex_key { @@ -3585,6 +3628,7 @@ func TestVndkApexShouldNotProvideNativeLibs(t *testing.T) { name: "com.android.vndk.current", key: "com.android.vndk.current.key", file_contexts: ":myapex-file_contexts", + updatable: false, } apex_key { @@ -3622,6 +3666,7 @@ func TestDependenciesInApexManifest(t *testing.T) { native_shared_libs: ["lib_nodep"], compile_multilib: "both", file_contexts: ":myapex-file_contexts", + updatable: false, } apex { @@ -3630,6 +3675,7 @@ func TestDependenciesInApexManifest(t *testing.T) { native_shared_libs: ["lib_dep"], compile_multilib: "both", file_contexts: ":myapex-file_contexts", + updatable: false, } apex { @@ -3638,6 +3684,7 @@ func TestDependenciesInApexManifest(t *testing.T) { native_shared_libs: ["libfoo"], compile_multilib: "both", file_contexts: ":myapex-file_contexts", + updatable: false, } apex { @@ -3646,6 +3693,7 @@ func TestDependenciesInApexManifest(t *testing.T) { native_shared_libs: ["lib_dep", "libfoo"], compile_multilib: "both", file_contexts: ":myapex-file_contexts", + updatable: false, } apex_key { @@ -3725,6 +3773,7 @@ func TestApexName(t *testing.T) { key: "myapex.key", apex_name: "com.android.myapex", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -3768,6 +3817,7 @@ func TestNonTestApex(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib_common"], + updatable: false, } apex_key { @@ -3820,6 +3870,7 @@ func TestTestApex(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib_common_test"], + updatable: false, } apex_key { @@ -3867,6 +3918,7 @@ func TestApexWithTarget(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, multilib: { first: { native_shared_libs: ["mylib_common"], @@ -3957,6 +4009,7 @@ func TestApexWithArch(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, arch: { arm64: { native_shared_libs: ["mylib.arm64"], @@ -4016,6 +4069,7 @@ func TestApexWithShBinary(t *testing.T) { name: "myapex", key: "myapex.key", binaries: ["myscript"], + updatable: false, } apex_key { @@ -4055,6 +4109,7 @@ func TestApexInVariousPartition(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, `+tc.propName+` } @@ -4087,6 +4142,7 @@ func TestFileContexts_FindInDefaultLocationIfNotSet(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, } apex_key { @@ -4106,6 +4162,7 @@ func TestFileContexts_ShouldBeUnderSystemSepolicyForSystemApexes(t *testing.T) { name: "myapex", key: "myapex.key", file_contexts: "my_own_file_contexts", + updatable: false, } apex_key { @@ -4125,6 +4182,7 @@ func TestFileContexts_ProductSpecificApexes(t *testing.T) { key: "myapex.key", product_specific: true, file_contexts: "product_specific_file_contexts", + updatable: false, } apex_key { @@ -4140,6 +4198,7 @@ func TestFileContexts_ProductSpecificApexes(t *testing.T) { key: "myapex.key", product_specific: true, file_contexts: "product_specific_file_contexts", + updatable: false, } apex_key { @@ -4162,6 +4221,7 @@ func TestFileContexts_SetViaFileGroup(t *testing.T) { key: "myapex.key", product_specific: true, file_contexts: ":my-file-contexts", + updatable: false, } apex_key { @@ -4635,6 +4695,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["libfoo", "libbar"], + updatable: false, } apex_key { @@ -4770,6 +4831,7 @@ func TestApexWithTests(t *testing.T) { apex_test { name: "myapex", key: "myapex.key", + updatable: false, tests: [ "mytest", "mytests", @@ -4881,6 +4943,7 @@ func TestInstallExtraFlattenedApexes(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, } apex_key { name: "myapex.key", @@ -4951,6 +5014,7 @@ func TestApexWithJavaImport(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["myjavaimport"], + updatable: false, } apex_key { @@ -4982,6 +5046,7 @@ func TestApexWithApps(t *testing.T) { "AppFoo", "AppFooPriv", ], + updatable: false, } apex_key { @@ -5060,6 +5125,7 @@ func TestApexWithAppImports(t *testing.T) { "AppFooPrebuilt", "AppFooPrivPrebuilt", ], + updatable: false, } apex_key { @@ -5107,6 +5173,7 @@ func TestApexWithAppImportsPrefer(t *testing.T) { apps: [ "AppFoo", ], + updatable: false, } apex_key { @@ -5148,6 +5215,7 @@ func TestApexWithTestHelperApp(t *testing.T) { apps: [ "TesterHelpAppFoo", ], + updatable: false, } apex_key { @@ -5178,6 +5246,7 @@ func TestApexPropertiesShouldBeDefaultable(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libfoo"], + updatable: false, } apex_key { @@ -5190,6 +5259,7 @@ func TestApexPropertiesShouldBeDefaultable(t *testing.T) { name: "otherapex", key: "myapex.key", native_shared_libs: ["libfoo"], + updatable: false, } cc_defaults { @@ -5212,6 +5282,7 @@ func TestApexAvailable_DirectDep(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libfoo"], + updatable: false, } apex_key { @@ -5224,6 +5295,7 @@ func TestApexAvailable_DirectDep(t *testing.T) { name: "otherapex", key: "otherapex.key", native_shared_libs: ["libfoo"], + updatable: false, } apex_key { @@ -5253,6 +5325,7 @@ func TestApexAvailable_IndirectDep(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libfoo"], + updatable: false, } apex_key { @@ -5290,6 +5363,7 @@ func TestApexAvailable_InvalidApexName(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libfoo"], + updatable: false, } apex_key { @@ -5310,6 +5384,7 @@ func TestApexAvailable_InvalidApexName(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libfoo", "libbar"], + updatable: false, } apex_key { @@ -5349,6 +5424,7 @@ func TestApexAvailable_CheckForPlatform(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libbar", "libbaz"], + updatable: false, } apex_key { @@ -5411,6 +5487,7 @@ func TestApexAvailable_CreatedForApex(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["libfoo"], + updatable: false, } apex_key { @@ -5446,6 +5523,7 @@ func TestOverrideApex(t *testing.T) { key: "myapex.key", apps: ["app"], overrides: ["oldapex"], + updatable: false, } override_apex { @@ -5588,6 +5666,7 @@ func TestJavaSDKLibrary(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["foo"], + updatable: false, } apex_key { @@ -5625,6 +5704,7 @@ func TestJavaSDKLibrary_WithinApex(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["foo", "bar"], + updatable: false, } apex_key { @@ -5677,6 +5757,7 @@ func TestJavaSDKLibrary_CrossBoundary(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["foo"], + updatable: false, } apex_key { @@ -5739,6 +5820,7 @@ func TestJavaSDKLibrary_ImportPreferred(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["foo", "bar"], + updatable: false, } apex_key { @@ -5816,6 +5898,7 @@ func TestJavaSDKLibrary_ImportOnly(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["foo"], + updatable: false, } apex_key { @@ -5843,6 +5926,7 @@ func TestCompatConfig(t *testing.T) { key: "myapex.key", prebuilts: ["myjar-platform-compat-config"], java_libs: ["myjar"], + updatable: false, } apex_key { @@ -5876,6 +5960,7 @@ func TestRejectNonInstallableJavaLibrary(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["myjar"], + updatable: false, } apex_key { @@ -5901,6 +5986,7 @@ func TestCarryRequiredModuleNames(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -5940,6 +6026,7 @@ func TestSymlinksFromApexToSystem(t *testing.T) { key: "myapex.key", native_shared_libs: ["mylib"], java_libs: ["myjar"], + updatable: false, } apex { @@ -6068,6 +6155,7 @@ func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -6119,6 +6207,7 @@ func TestApexWithJniLibs(t *testing.T) { name: "myapex", key: "myapex.key", jni_libs: ["mylib"], + updatable: false, } apex_key { @@ -6159,6 +6248,7 @@ func TestApexMutatorsDontRunIfDisabled(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, } apex_key { name: "myapex.key", @@ -6181,6 +6271,7 @@ func TestAppBundle(t *testing.T) { name: "myapex", key: "myapex.key", apps: ["AppFoo"], + updatable: false, } apex_key { @@ -6211,6 +6302,7 @@ func TestAppSetBundle(t *testing.T) { name: "myapex", key: "myapex.key", apps: ["AppSet"], + updatable: false, } apex_key { @@ -6317,6 +6409,7 @@ func testNoUpdatableJarsInBootImage(t *testing.T, errmsg string, transformDexpre name: "some-non-updatable-apex", key: "some-non-updatable-apex.key", java_libs: ["some-non-updatable-apex-lib"], + updatable: false, } apex_key { @@ -6440,6 +6533,21 @@ func TestUpdatable_should_set_min_sdk_version(t *testing.T) { `) } +func TestUpdatableDefault_should_set_min_sdk_version(t *testing.T) { + testApexError(t, `"myapex" .*: updatable: updatable APEXes should set min_sdk_version`, ` + apex { + name: "myapex", + key: "myapex.key", + } + + apex_key { + name: "myapex.key", + public_key: "testkey.avbpubkey", + private_key: "testkey.pem", + } + `) +} + func TestNoUpdatableJarsInBootImage(t *testing.T) { var err string var transform func(*dexpreopt.GlobalConfig) @@ -6654,6 +6762,7 @@ func TestApexPermittedPackagesRules(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["bcp_lib1", "nonbcp_lib2"], + updatable: false, }`, bootJars: []string{"bcp_lib1"}, modulesPackages: map[string][]string{ @@ -6686,6 +6795,7 @@ func TestApexPermittedPackagesRules(t *testing.T) { name: "myapex", key: "myapex.key", java_libs: ["bcp_lib1", "bcp_lib2"], + updatable: false, } `, bootJars: []string{"bcp_lib1", "bcp_lib2"}, @@ -6710,6 +6820,7 @@ func TestTestFor(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib", "myprivlib"], + updatable: false, } apex_key { @@ -6834,6 +6945,7 @@ func TestNoStaticLinkingToStubsLib(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -6869,6 +6981,7 @@ func TestApexKeysTxt(t *testing.T) { apex { name: "myapex", key: "myapex.key", + updatable: false, } apex_key { @@ -6911,6 +7024,7 @@ func TestAllowedFiles(t *testing.T) { key: "myapex.key", apps: ["app"], allowed_files: "allowed.txt", + updatable: false, } apex_key { @@ -6965,6 +7079,7 @@ func TestNonPreferredPrebuiltDependency(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -7000,6 +7115,7 @@ func TestCompressedApex(t *testing.T) { name: "myapex", key: "myapex.key", compressible: true, + updatable: false, } apex_key { name: "myapex.key", @@ -7034,6 +7150,7 @@ func TestPreferredPrebuiltSharedLibDep(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -7085,6 +7202,7 @@ func TestExcludeDependency(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { @@ -7134,6 +7252,7 @@ func TestPrebuiltStubLibDep(t *testing.T) { name: "myapex", key: "myapex.key", native_shared_libs: ["mylib"], + updatable: false, } apex_key { name: "myapex.key", @@ -7152,6 +7271,7 @@ func TestPrebuiltStubLibDep(t *testing.T) { enabled: %s, key: "myapex.key", native_shared_libs: ["stublib"], + updatable: false, } ` diff --git a/apex/boot_image_test.go b/apex/boot_image_test.go index 27a15624d..ff779e169 100644 --- a/apex/boot_image_test.go +++ b/apex/boot_image_test.go @@ -48,6 +48,7 @@ func TestBootImages(t *testing.T) { "baz", "quuz", ], + updatable: false, } apex_key { @@ -187,6 +188,7 @@ func TestBootImageInApex(t *testing.T) { boot_images: [ "mybootimage", ], + updatable: false, } apex_key { diff --git a/apex/vndk_test.go b/apex/vndk_test.go index 74a79e1c5..5e9a11f8c 100644 --- a/apex/vndk_test.go +++ b/apex/vndk_test.go @@ -13,6 +13,7 @@ func TestVndkApexForVndkLite(t *testing.T) { apex_vndk { name: "com.android.vndk.current", key: "com.android.vndk.current.key", + updatable: false, } apex_key { @@ -69,6 +70,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) { apex_vndk { name: "com.android.vndk.current", key: "mykey", + updatable: false, } apex_key { name: "mykey", diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 997d2f66b..359177771 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -251,6 +251,7 @@ func TestBasicSdkWithCc(t *testing.T) { uses_sdks: ["mysdk@1"], key: "myapex.key", certificate: ":myapex.cert", + updatable: false, } apex { @@ -259,6 +260,7 @@ func TestBasicSdkWithCc(t *testing.T) { uses_sdks: ["mysdk@2"], key: "myapex.key", certificate: ":myapex.cert", + updatable: false, } apex { @@ -266,6 +268,7 @@ func TestBasicSdkWithCc(t *testing.T) { native_shared_libs: ["sdkmember"], key: "myapex.key", certificate: ":myapex.cert", + updatable: false, } `) diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 17a6ca9b8..111b22c68 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -211,6 +211,7 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { uses_sdks: ["mysdk@1"], key: "myapex.key", certificate: ":myapex.cert", + updatable: false, } apex { @@ -219,6 +220,7 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { uses_sdks: ["mysdk@2"], key: "myapex.key", certificate: ":myapex.cert", + updatable: false, } `)