Revert "android: Revert "build-android: Use c++_shared""

This reverts commit 8ac59a8.
KhronosGroup · Mar 24, 2023 · 4ac0fd8 · 4ac0fd8
1 parent 8ac59a8
commit 4ac0fd8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk
@@ -1,6 +1,5 @@
-# Copyright 2023 The Android Open Source Project
-# Copyright (C) 2023 Valve Corporation
-# Copyright (C) 2023 LunarG, Inc.
+# Copyright 2015 The Android Open Source Project
+# Copyright (C) 2015 Valve Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,6 +16,6 @@
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
 # APP_ABI := arm64-v8a   # just build for pixel2  (don't check in)
 APP_PLATFORM := android-26
-APP_STL := c++_static
+APP_STL := c++_shared
 NDK_TOOLCHAIN_VERSION := clang
 NDK_MODULE_PATH := .
diff --git a/build-android/jni/shaderc/Application.mk b/build-android/jni/shaderc/Application.mk
@@ -1,4 +1,4 @@
 APP_ABI := all
 APP_BUILD_SCRIPT := Android.mk
-APP_STL := c++_static
+APP_STL := c++_shared
 APP_PLATFORM := android-23