From 7a57092288dc873c982dac1086ee06aa7ffb49f6 Mon Sep 17 00:00:00 2001 From: "Chaitanya Cheemala (xWF)" Date: Fri, 7 Feb 2025 01:37:56 -0800 Subject: Revert "Move MutateApexTransition shortcut later" Revert submission 3477737-move_apex_shortcut Reason for revert: Likely culprit for b/394990888 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:3477737-move_apex_shortcut Change-Id: I67459460e847451d06e733a01249e3dd8017a2e0 --- sdk/cc_sdk_test.go | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'sdk/cc_sdk_test.go') diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 5bac67da6..939477f61 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -805,19 +805,13 @@ func TestSnapshotWithCcSharedLibrary(t *testing.T) { native_shared_libs: ["mynativelib"], } - apex { - name: "myapex", - key: "myapex.key", - min_sdk_version: "1", - } - cc_library_shared { name: "mynativelib", srcs: [ "Test.cpp", "aidl/foo/bar/Test.aidl", ], - apex_available: ["myapex"], + apex_available: ["apex1", "apex2"], export_include_dirs: ["myinclude"], aidl: { export_aidl_headers: true, @@ -827,18 +821,6 @@ func TestSnapshotWithCcSharedLibrary(t *testing.T) { `) CheckSnapshot(t, result, "mysdk", "", - snapshotTestPreparer(checkSnapshotWithoutSource, - android.FixtureMergeMockFs(android.MockFS{ - "myapex/Android.bp": []byte(` - apex { - name: "myapex", - key: "myapex.key", - min_sdk_version: "1", - } - `), - "myapex/apex_manifest.json": nil, - }), - ), checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. @@ -851,7 +833,10 @@ cc_prebuilt_library_shared { name: "mynativelib", prefer: false, visibility: ["//visibility:public"], - apex_available: ["myapex"], + apex_available: [ + "apex1", + "apex2", + ], stl: "none", compile_multilib: "both", export_include_dirs: ["include/myinclude"], -- cgit v1.2.3-59-g8ed1b