commit 1b68b2ea68fcd4e764ed0b17008546e0c5cf562c
author Barış Kaya <bkaya@google.com> Tue May 24 12:01:36 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 24 12:01:36 2022 +0000
tree e191bf1cd22ae8f8a186704ea42b551d54b82bc9
parent da11887c45f169915928a2db53ce9c2118b489ea
parent ba94e99e116fd66d08ade729d62fea0dbe3cb221

Merge "Fix memory_advice not building with the gamesdk full target."

build.sh

diff --git a/build.sh b/build.sh
index 38205f7..9d86a1c 100755
--- a/build.sh
+++ b/build.sh
@@ -31,14 +31,15 @@
 if [[ $1 == "full" ]]
 then
     package_name=fullsdk
-    ./gradlew packageZip -Plibraries=swappy,tuningfork,oboe,game_activity,game_text_input,paddleboat -PincludeSampleSources -PincludeSampleArtifacts -PdistPath="$dist_dir" -PpackageName=$package_name
+    ./gradlew packageZip -Plibraries=swappy,tuningfork,oboe,game_activity,game_text_input,paddleboat,memory_advice -PincludeSampleSources -PincludeSampleArtifacts -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=swappy -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=tuningfork -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=oboe -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=game_activity -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=game_text_input -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=paddleboat -PdistPath="$dist_dir" -PpackageName=$package_name
-    ./gradlew jetpadJson -Plibraries=swappy,tuningfork,game_activity,game_text_input,paddleboat -PdistPath="$dist_dir" -PpackageName=$package_name
+    /gradlew packageMavenZip -Plibraries=memory_advice -PdistPath="$dist_dir" -PpackageName=$package_name
+    ./gradlew jetpadJson -Plibraries=swappy,tuningfork,game_activity,game_text_input,paddleboat,memory_advice -PdistPath="$dist_dir" -PpackageName=$package_name
 elif [[ $1 == "samples" ]]
 then
     package_name=gamesdk
@@ -54,11 +55,12 @@
     ./gradlew packageMavenZip -Plibraries=game_activity -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=game_text_input -PdistPath="$dist_dir" -PpackageName=$package_name
     ./gradlew packageMavenZip -Plibraries=paddleboat -PdistPath="$dist_dir" -PpackageName=$package_name
-    ./gradlew jetpadJson -Plibraries=swappy,tuningfork,game_activity,game_text_input,paddleboat -PdistPath="$dist_dir" -PpackageName=$package_name
+    ./gradlew packageMavenZip -Plibraries=memory_advice -PdistPath="$dist_dir" -PpackageName=$package_name
+    ./gradlew jetpadJson -Plibraries=swappy,tuningfork,game_activity,game_text_input,paddleboat,memory_advice -PdistPath="$dist_dir" -PpackageName=$package_name
 else
     # The default is to build the express zip
     package_name=gamesdk-express
-    ./gradlew packageZip -Plibraries=swappy,tuningfork,oboe,game_activity,game_text_input,paddleboat -PincludeSampleSources -PincludeSampleArtifacts -PdistPath="$dist_dir" -PpackageName=$package_name -Pexpress
+    ./gradlew packageZip -Plibraries=swappy,tuningfork,oboe,game_activity,game_text_input,paddleboat,memory_advice -PincludeSampleSources -PincludeSampleArtifacts -PdistPath="$dist_dir" -PpackageName=$package_name -Pexpress
 fi
 
 # Calculate hash of the zip file

buildSrc/src/main/java/com/google/androidgamesdk/TensorflowPatcher.kt

diff --git a/buildSrc/src/main/java/com/google/androidgamesdk/TensorflowPatcher.kt b/buildSrc/src/main/java/com/google/androidgamesdk/TensorflowPatcher.kt
index 41cfdbe..1e32d0a 100644
--- a/buildSrc/src/main/java/com/google/androidgamesdk/TensorflowPatcher.kt
+++ b/buildSrc/src/main/java/com/google/androidgamesdk/TensorflowPatcher.kt
@@ -159,7 +159,7 @@
     }
 
     /**
-    * The xnnpack library on platform/external is updated; fix its cmake file.
+    * The xnnpack library on platform/external is outdated; fix its cmake file.
     */
     private fun patchXnnpack() {
         val xnnpackCmake = project.file("../external/xnnpack/CMakeLists.txt");
@@ -172,6 +172,14 @@
             "\n" +
                 "  src/f16-maxpool/9p8x-minmax-f16c-c8.c\n" +
                 "  src/f16-vbinary/gen/vadd-minmax-f16c-x16.c");
+        xnnpackCmakeContent = xnnpackCmakeContent.replace(
+            "\n" +
+                "    SET_PROPERTY(SOURCE \${ALL_NEONDOT_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS \" -mfloat-abi=softfp \")\n" +
+                "  ENDIF()",
+            "\n" +
+                "    SET_PROPERTY(SOURCE \${ALL_NEONDOT_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS \" -mfloat-abi=softfp \")\n" +
+                "    SET_PROPERTY(SOURCE \${AARCH32_ASM_MICROKERNEL_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS \" -mfloat-abi=softfp \")\n" +
+                "  ENDIF()");
         xnnpackCmake.writeText(xnnpackCmakeContent);
     }