Copy in prefab build scripts and bump version to 1.4.3

google · Aug 5, 2020 · d25993c · d25993c
1 parent 9fba183
commit d25993c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/build_all_android.sh b/build_all_android.sh
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script to build Oboe for multiple Android ABIs and prepare them for distribution 
+# Script to build Oboe for multiple Android ABIs and prepare them for distribution
 # via Prefab (github.com/google/prefab)
 #
 # Ensure that ANDROID_NDK environment variable is set to your Android NDK location
@@ -29,6 +29,7 @@ fi
 BUILD_DIR=build
 
 CMAKE_ARGS="-H. \
+  -DBUILD_SHARED_LIBS=true \
   -DCMAKE_BUILD_TYPE=Release \
   -DANDROID_TOOLCHAIN=clang \
   -DANDROID_STL=c++_shared \
@@ -65,4 +66,4 @@ build_oboe x86_64 21
 # Currently unsupported ABIs
 # build_oboe armeabi 16 - This was deprecated in Android 16 and removed in 17
 # build_oboe mips 21 - This was deprecated in Android 16 and removed in 17
-# build_oboe mips64
+# build_oboe mips64
diff --git a/include/oboe/Version.h b/include/oboe/Version.h
@@ -37,7 +37,7 @@
 #define OBOE_VERSION_MINOR 4
 
 // Type: 16-bit unsigned int. Min value: 0 Max value: 65535. See below for description.
-#define OBOE_VERSION_PATCH 2
+#define OBOE_VERSION_PATCH 3
 
 #define OBOE_STRINGIFY(x) #x
 #define OBOE_TOSTRING(x) OBOE_STRINGIFY(x)

diff --git a/prefab/oboe-VERSION.pom b/prefab/oboe-VERSION.pom
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>com.google.oboe</groupId>
   <artifactId>oboe</artifactId>
-  <version>1.3.0</version>
+  <version>VERSION</version>
   <packaging>aar</packaging>
   <name>oboe</name>
   <description>The AAR for Oboe.</description>

diff --git a/prefab/oboe-VERSION/prefab/prefab.json b/prefab/oboe-VERSION/prefab/prefab.json
@@ -1,6 +1,6 @@
 {
     "schema_version": 1,
     "name": "oboe",
-    "version": "1.3.0",
+    "version": "VERSION",
     "dependencies": []
-}
+}