diff options
Diffstat (limited to 'sdk/cc_sdk_test.go')
-rw-r--r-- | sdk/cc_sdk_test.go | 25 |
1 files changed, 5 insertions, 20 deletions
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"], |