Merge "android_app stl property bug fix"

2019-06-05 20:16:13 +00:00
parent ac1d267368 710756a6ff
commit 4f67c42d76
4 changed files with 11 additions and 4 deletions
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -1203,6 +1203,10 @@ func TestStl(t *testing.T) {
 			compile_multilib: "both",
 			sdk_version: "current",
 		}
+
+		ndk_prebuilt_shared_stl {
+			name: "ndk_libc++_shared",
+		}
 		`)

 	testCases := []struct {
@@ -1212,7 +1216,7 @@ func TestStl(t *testing.T) {
 		{"stl",
 			[]string{
 				"libjni.so",
-				"libc++.so",
+				"libc++_shared.so",
 			},
 		},
 		{"system",