Merge "Build connectivity JNI against libc++_static"
This commit is contained in:
@@ -137,6 +137,7 @@ cc_library_shared {
|
|||||||
"jni/onload.cpp",
|
"jni/onload.cpp",
|
||||||
],
|
],
|
||||||
shared_libs: ["libandroid"],
|
shared_libs: ["libandroid"],
|
||||||
|
stl: "libc++_static",
|
||||||
apex_available: [
|
apex_available: [
|
||||||
"//apex_available:platform",
|
"//apex_available:platform",
|
||||||
"com.android.tethering",
|
"com.android.tethering",
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ cc_library_shared {
|
|||||||
"jni/com_android_server_TestNetworkService.cpp",
|
"jni/com_android_server_TestNetworkService.cpp",
|
||||||
"jni/onload.cpp",
|
"jni/onload.cpp",
|
||||||
],
|
],
|
||||||
|
stl: "libc++_static",
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"libbase",
|
"libbase",
|
||||||
"liblog",
|
"liblog",
|
||||||
|
|||||||
Reference in New Issue
Block a user