From 2261a82dbd9599fc1a7091fffea6931fbb5c4963 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Thu, 12 Sep 2024 00:01:54 +0000 Subject: Remove unused property naming_scheme in java_sdk_library The property was introduced as an interim solution, and is currently unused. Test: m nothing --no-skip-soong-tests Bug: 366071058 Change-Id: I57abdb64fabdb34fbbd1190851bc528dbb88c7f8 --- sdk/java_sdk_test.go | 55 ---------------------------------------------------- 1 file changed, 55 deletions(-) (limited to 'sdk/java_sdk_test.go') diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 0fb5c70d2..09a7c9e8c 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -1703,61 +1703,6 @@ java_sdk_library_import { ) } -func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) { - result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` - sdk { - name: "mysdk", - java_sdk_libs: ["myjavalib"], - } - - java_sdk_library { - name: "myjavalib", - apex_available: ["//apex_available:anyapex"], - srcs: ["Test.java"], - sdk_version: "current", - naming_scheme: "default", - public: { - enabled: true, - }, - } - `) - - CheckSnapshot(t, result, "mysdk", "", - checkAndroidBpContents(` -// This is auto-generated. DO NOT EDIT. - -apex_contributions_defaults { - name: "mysdk.contributions", - contents: ["prebuilt_myjavalib"], -} - -java_sdk_library_import { - name: "myjavalib", - prefer: false, - visibility: ["//visibility:public"], - apex_available: ["//apex_available:anyapex"], - naming_scheme: "default", - shared_library: true, - public: { - jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], - current_api: "sdk_library/public/myjavalib.txt", - removed_api: "sdk_library/public/myjavalib-removed.txt", - sdk_version: "current", - }, -} -`), - checkAllCopyRules(` -.intermediates/myjavalib.stubs.exportable/android_common/combined/myjavalib.stubs.exportable.jar -> sdk_library/public/myjavalib-stubs.jar -.intermediates/myjavalib.stubs.source/android_common/exportable/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt -.intermediates/myjavalib.stubs.source/android_common/exportable/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt -`), - checkMergeZips( - ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", - ), - ) -} - func TestSnapshotWithJavaSdkLibrary_DoctagFiles(t *testing.T) { result := android.GroupFixturePreparers( prepareForSdkTestWithJavaSdkLibrary, -- cgit v1.2.3-59-g8ed1b