diff options
author | 2024-11-01 12:21:54 -0700 | |
---|---|---|
committer | 2024-11-01 12:21:54 -0700 | |
commit | f1f447df6e14ba0b9b437ece92846ede205ad074 (patch) | |
tree | 184af2311b8a6371e1cb017c51f12f7dd4e4f3eb | |
parent | f5755e177aeea22f80b46e3b5597ae98a87acfcf (diff) |
Remove sdk_genrule
The only usage was removed in aosp/3316099
Bug: 372091092
Test: m nothing --no-skip-soong-tests
Change-Id: I5e1dd9015bb7aa94ddfd1eaae314db04ee77181f
-rw-r--r-- | sdk/Android.bp | 2 | ||||
-rw-r--r-- | sdk/genrule.go | 44 | ||||
-rw-r--r-- | sdk/genrule_test.go | 45 |
3 files changed, 0 insertions, 91 deletions
diff --git a/sdk/Android.bp b/sdk/Android.bp index f436320df..f42b4787d 100644 --- a/sdk/Android.bp +++ b/sdk/Android.bp @@ -18,7 +18,6 @@ bootstrap_go_package { "bp.go", "build_release.go", "exports.go", - "genrule.go", "member_trait.go", "member_type.go", "sdk.go", @@ -31,7 +30,6 @@ bootstrap_go_package { "cc_sdk_test.go", "compat_config_sdk_test.go", "exports_test.go", - "genrule_test.go", "java_sdk_test.go", "license_sdk_test.go", "member_trait_test.go", diff --git a/sdk/genrule.go b/sdk/genrule.go deleted file mode 100644 index 347ab0556..000000000 --- a/sdk/genrule.go +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2023 Google Inc. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -package sdk - -import ( - "android/soong/android" - "android/soong/genrule" -) - -func init() { - registerGenRuleBuildComponents(android.InitRegistrationContext) -} - -func registerGenRuleBuildComponents(ctx android.RegistrationContext) { - ctx.RegisterModuleType("sdk_genrule", SdkGenruleFactory) -} - -// sdk_genrule_host is a genrule that can depend on sdk and sdk_snapshot module types -// -// What this means is that it's a genrule with only the "common_os" variant. -// sdk modules have 3 variants: host, android, and common_os. The common_os one depends -// on the host/device ones and packages their result into a final snapshot zip. -// Genrules probably want access to this snapshot zip when they depend on an sdk module, -// which means they want to depend on the common_os variant and not the host/android -// variants. -func SdkGenruleFactory() android.Module { - module := genrule.NewGenRule() - - android.InitCommonOSAndroidMultiTargetsArchModule(module, android.NeitherHostNorDeviceSupported, android.MultilibCommon) - android.InitDefaultableModule(module) - - return module -} diff --git a/sdk/genrule_test.go b/sdk/genrule_test.go deleted file mode 100644 index bf67795a7..000000000 --- a/sdk/genrule_test.go +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2018 Google Inc. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package sdk - -import ( - "testing" - - "android/soong/android" - "android/soong/genrule" - "android/soong/java" -) - -func TestSdkGenrule(t *testing.T) { - // Test that a genrule can depend on an sdk if using common_os_srcs - bp := ` - sdk { - name: "my_sdk", - } - genrule { - name: "my_regular_genrule", - common_os_srcs: [":my_sdk"], - out: ["out"], - cmd: "cp $(in) $(out)", - } - ` - android.GroupFixturePreparers( - // if java components aren't registered, the sdk module doesn't create a snapshot for some reason. - java.PrepareForTestWithJavaBuildComponents, - genrule.PrepareForTestWithGenRuleBuildComponents, - PrepareForTestWithSdkBuildComponents, - android.FixtureRegisterWithContext(registerGenRuleBuildComponents), - ).RunTestWithBp(t, bp) -} |