bump aap-core and revised build setup.

atsushieno · Feb 16, 2024 · a98acfc · a98acfc
1 parent c37ace7
commit a98acfc
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 104 deletions.
diff --git a/aap-juce-support.patch b/aap-juce-support.patch
@@ -1,43 +1,24 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 76b0075..eba94d3 100644
+index 026037d..074184b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -68,6 +68,34 @@ add_subdirectory(external/JUCE)
+@@ -68,6 +68,15 @@ add_subdirectory(external/JUCE)
  add_subdirectory(external/clap-juce-extensions EXCLUDE_FROM_ALL)
 
 
 +# begin AAP specifics -->
 +if (DEFINED AAP_DIR)
-+
-+## They are needed in desktop too, for generate-aap-metadata.
-+include_directories(
-+  "${AAP_DIR}/include"
-+)
-+add_definitions([[-DJUCE_PUSH_NOTIFICATIONS_ACTIVITY="com/rmsl/juce/JuceActivity"]])
++find_package(androidaudioplugin REQUIRED CONFIG)
++include_directories(${AAP_DIR}/include)
 +juce_add_modules(${AAP_JUCE_DIR}/aap-modules/aap_audio_processors)
-+
-+add_compile_definitions([[JUCE_DONT_AUTO_OPEN_MIDI_DEVICES_ON_MOBILE=1]])
-+
-+if (ANDROID)
-+  # dependencies
-+  find_library(log "log")
-+  find_library(android "android")
-+  find_library(glesv2 "GLESv2")
-+  find_library(egl "EGL")
-+  set(cpufeatures_lib "cpufeatures")
-+  set(oboe_lib "oboe")
-+endif (ANDROID)
-+message("AAP_DIR: ${AAP_DIR}")
-+message("AAP_JUCE_DIR: ${AAP_JUCE_DIR}")
-+
 +else()
 +message("AAP_DIR not defined: skipping AAP build.")
 +endif()
 +# <-- end AAP specifics
 
  # common build fragment using macro
 
-@@ -231,6 +259,30 @@ else ()
+@@ -232,6 +241,41 @@ else ()
      message(FATAL_ERROR "unsupported chip ${ADLplug_CHIP}")
  endif()
 
@@ -48,13 +29,24 @@ index 76b0075..eba94d3 100644
 +target_compile_definitions(${APP_NAME} PUBLIC
 +    JUCEAAP_HAVE_AUDIO_PLAYHEAD_NEW_POSITION_INFO=1
 +    JUCE_PUSH_NOTIFICATIONS=1
++    JUCE_PUSH_NOTIFICATIONS_ACTIVITY="com/rmsl/juce/JuceActivity"
++    JUCE_DONT_AUTO_OPEN_MIDI_DEVICES_ON_MOBILE=1
 +    )
 +
 +if (ANDROID)
 +  target_include_directories(${APP_NAME} PRIVATE
 +    "${ANDROID_NDK}/sources/android/cpufeatures"
 +    "${OBOE_DIR}/include"
 +    )
++
++  # dependencies
++  find_library(log "log")
++  find_library(android "android")
++  find_library(glesv2 "GLESv2")
++  find_library(egl "EGL")
++  set(cpufeatures_lib "cpufeatures")
++  set(oboe_lib "oboe")
++
 +endif (ANDROID)
 +
 +target_link_libraries(${APP_NAME}
@@ -139,7 +131,7 @@ index d5914b1..67e8e89 100644
      : MidiKeyboardComponent(state, orientation),
        designated_note_color_((uint8_t)245, 0, 41, 0.5f)
 diff --git a/external/ADLplug/sources/ui/components/midi_keyboard_ex.h b/external/ADLplug/sources/ui/components/midi_keyboard_ex.h
-index f742ef6..3887945 100644
+index f742ef6..ec878e9 100644
 --- a/external/ADLplug/sources/ui/components/midi_keyboard_ex.h
 +++ b/external/ADLplug/sources/ui/components/midi_keyboard_ex.h
 @@ -6,12 +6,7 @@
@@ -152,7 +144,7 @@ index f742ef6..3887945 100644
 -}
 -
 -class Midi_Keyboard_Ex : public ex::juce::MidiKeyboardComponent {
-+class Midi_Keyboard_Ex : public juce::MidiKeyboardComponent {
++class Midi_Keyboard_Ex : public juce::MidiKeyboardComponent {
  public:
      Midi_Keyboard_Ex(MidiKeyboardState &state, Orientation orientation);
      void highlight_note(unsigned note, unsigned velocity);

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,11 +9,11 @@ kotlin {
 
 android {
     namespace = "org.androidaudioplugin.ports.juce.adlplug_ae"
-    compileSdk = 34
+    compileSdk = libs.versions.android.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk = 29
-        targetSdk = 34
+        minSdk = libs.versions.android.minSdk.get().toInteger()
+        targetSdk = libs.versions.android.targetSdk.get().toInteger()
         ndk {
             abiFilters "x86_64", "arm64-v8a"
         }
@@ -26,6 +26,9 @@ android {
             }
         }
         proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        buildFeatures {
+            prefab true
+        }
     }
 
     sourceSets {

diff --git a/external/aap-core b/external/aap-core
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1 @@
+../external/aap-core/gradle/libs.versions.toml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1 @@
+../../external/aap-core/gradle/wrapper/gradle-wrapper.properties
+2 −0		androidaudioplugin/src/main/aidl/org/androidaudioplugin/AudioPluginInterface.aidl
+21 −12		androidaudioplugin/src/main/cpp/android/AudioPluginInterfaceImpl.h
+22 −17		androidaudioplugin/src/main/cpp/android/audio-plugin-host-android-internal.h
+7 −0		androidaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/AudioPluginInterface.h
+3 −0		androidaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/AudioPluginInterfaceCallback.h
+5 −1		androidaudioplugin/src/main/update-binder.sh
+3 −3		common.gradle
+12 −8		gradle.properties
+10 −4		gradle/libs.versions.toml
+0 −9		publish-pom.gradle
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../external/aap-core/gradle/wrapper/gradle-wrapper.properties