make AGDKTunnel sample use MemoryAdvice from source

Bug: N/A
Test: build and run AGDKTunnel
Change-Id: I2207c22e140d67ce9ceeb712af5301650bfeb662

4 files changed, 5 insertions, 6 deletions

diff --git a/samples/agdktunnel/app/build.gradle b/samples/agdktunnel/app/build.gradle
index 4c22a9e0..5aae97db 100644
--- a/samples/agdktunnel/app/build.gradle
+++ b/samples/agdktunnel/app/build.gradle
@@ -115,7 +115,7 @@ dependencies {
 //    implementation "androidx.games:games-performance-tuner:1.5.0-beta01"
 //    implementation "androidx.games:games-controller:1.0.0"
 //    implementation "androidx.games:games-activity:1.1.0"
-    implementation "androidx.games:games-memory-advice:1.0.0-beta01"
+//    implementation "androidx.games:games-memory-advice:1.0.0-beta01"
     // Uncomment the line below (implementation fileTree...)
     // and comment out "implementation project(":*")" lines
     // to use a locally built .aar
@@ -130,6 +130,7 @@ dependencies {
     implementation project(':games-performance-tuner')
     implementation project(':games-frame-pacing')
     implementation project(':games-controller')
+    implementation project(':games-memory-advice')
 
     // Google Play Games dependencies
     implementation "com.google.android.gms:play-services-games-v2:17.0.0"
diff --git a/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt b/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt
index 1c67bb3e..cd6e2aa1 100644
--- a/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt
+++ b/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt
@@ -125,7 +125,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
      games-controller::paddleboat_static
      games-frame-pacing::swappy_static
      games-performance-tuner::tuningfork_static
-     games-memory-advice::memory_advice
+     games-memory-advice::memory_advice_static
      GLESv3
      glm
      log)
diff --git a/samples/agdktunnel/app/src/main/java/com/google/sample/agdktunnel/AGDKTunnelActivity.java b/samples/agdktunnel/app/src/main/java/com/google/sample/agdktunnel/AGDKTunnelActivity.java
index e964fc13..447df163 100644
--- a/samples/agdktunnel/app/src/main/java/com/google/sample/agdktunnel/AGDKTunnelActivity.java
+++ b/samples/agdktunnel/app/src/main/java/com/google/sample/agdktunnel/AGDKTunnelActivity.java
@@ -56,10 +56,6 @@ public class AGDKTunnelActivity extends GameActivity {
         // See https://developer.android.com/ndk/guides/cpp-support#shared_runtimes
         System.loadLibrary("c++_shared");
 
-        // Optional: reload the memory advice library explicitly (it will be loaded
-        // implicitly when loading agdktunnel library as a dependent library)
-        System.loadLibrary("memory_advice");
-
         // Optional: reload the native library.
         // However this is necessary when any of the following happens:
         //     - agdktunnel library is not configured to the following line in the manifest:
diff --git a/samples/agdktunnel/settings.gradle b/samples/agdktunnel/settings.gradle
index 0abe7ede..acd95f65 100644
--- a/samples/agdktunnel/settings.gradle
+++ b/samples/agdktunnel/settings.gradle
@@ -24,8 +24,10 @@ include ':games-performance-tuner'
 include ':games-frame-pacing:extras'
 include ':games-frame-pacing'
 include ':games-controller'
+include ':games-memory-advice'
 project(':game-activity').projectDir                = file('../../game-activity')
 project(':games-performance-tuner').projectDir      = file('../../games-performance-tuner')
 project(':games-frame-pacing').projectDir           = file('../../games-frame-pacing')
 project(':games-frame-pacing:extras').projectDir    = file('../../games-frame-pacing/extras')
 project(':games-controller').projectDir             = file('../../games-controller')
+project(':games-memory-advice').projectDir          = file('../../games-memory-advice')