From 2973c1106fc92216e208d5096bd69414a7f13ca4 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 18 Dec 2019 00:15:07 +0000 Subject: Revert "Also package recursive jni_libs deps of android_apps as well as direct deps." This reverts commit 6f907ad3ddad9eb0e928ff7ad7965fa17a8a6946. Reason for revert: Broke FrameworksNetSmokeTests Bug: 146456945 Change-Id: Ibef7bb80c532e70cfcfb974f51a99ed25437a343 --- java/app_test.go | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'java/app_test.go') diff --git a/java/app_test.go b/java/app_test.go index 5cf0ba78d..1800bb73b 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -1630,46 +1630,8 @@ func TestAndroidTestImport(t *testing.T) { func TestStl(t *testing.T) { ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+` - cc_library { - name: "ndk_libunwind", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_library { - name: "libc.ndk.current", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_library { - name: "libm.ndk.current", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_library { - name: "libdl.ndk.current", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_object { - name: "ndk_crtbegin_so.27", - } - - cc_object { - name: "ndk_crtend_so.27", - } - cc_library { name: "libjni", - sdk_version: "current", - stl: "c++_shared", } android_test { -- cgit v1.2.3-59-g8ed1b