Move AOSP libs to root libs dir

grote · Aug 28, 2024 · 48aea1d · 48aea1d
1 parent 97a869f
commit 48aea1d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -187,7 +187,7 @@ dependencies {
 
 gradle.projectsEvaluated {
     tasks.withType(JavaCompile::class) {
-        options.compilerArgs.add("-Xbootclasspath/p:app/libs/android.jar:app/libs/libcore.jar")
+        options.compilerArgs.add("-Xbootclasspath/p:libs/aosp/android.jar:libs/aosp/libcore.jar")
     }
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 }
 
 val aospLibs by extra {
-    fileTree("$rootDir/app/libs") { // TODO move libs to root
+    fileTree("$rootDir/libs/aosp") {
         // For more information about this module:
         // https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-11.0.0_r3/Android.bp#507
         // framework_intermediates/classes-header.jar works for gradle build as well,

diff --git a/app/libs/android.jar → libs/aosp/android.jar b/app/libs/android.jar → libs/aosp/android.jar
diff --git a/app/libs/libcore.jar → libs/aosp/libcore.jar b/app/libs/libcore.jar → libs/aosp/libcore.jar