Merge "Export files for the build-tools sdk-repo build"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1

2 files changed, 113 insertions, 0 deletions

diff --git a/renderscript/Android.bp b/renderscript/Android.bp
index c87c80026..e2e474c15 100644
--- a/renderscript/Android.bp
+++ b/renderscript/Android.bp
@@ -105,3 +105,47 @@ java_import {
 }
 
 //#################################
+genrule {
+    name: "renderscript_sdk_prebuilts",
+    visibility: ["//development/build"],
+    tools: ["soong_zip", "zip2zip"],
+    cmd: "echo $(in) >$(genDir)/list && " +
+        "$(location soong_zip) -o $(out).unmapped -C prebuilts/sdk/renderscript/lib -l $(genDir)/list && " +
+        "$(location zip2zip) -i $(out).unmapped -o $(out)" +
+        " javalib.jar:renderscript/lib/androidx-rs.jar" +
+        " javalib_legacy.jar:renderscript/lib/renderscript-v8.jar" +
+        " arm/libc.so:renderscript/lib/intermediates/armeabi-v7a/libc.so" +
+        " arm/libm.so:renderscript/lib/intermediates/armeabi-v7a/libm.so" +
+        " arm/libcompiler_rt.a:renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a" +
+        " arm/libRSSupport.so:renderscript/lib/packaged/armeabi-v7a/libRSSupport.so" +
+        " arm/librsjni.so:renderscript/lib/packaged/armeabi-v7a/librsjni.so" +
+        " arm/librsjni_androidx.so:renderscript/lib/packaged/armeabi-v7a/librsjni_androidx.so" +
+        " arm/libblasV8.so:renderscript/lib/blas/armeabi-v7a/libblasV8.so" +
+        " arm/librsrt_arm.bc:renderscript/lib/bc/armeabi-v7a/libclcore.bc" +
+        " x86/libc.so:renderscript/lib/intermediates/x86/libc.so" +
+        " x86/libm.so:renderscript/lib/intermediates/x86/libm.so" +
+        " x86/libcompiler_rt.a:renderscript/lib/intermediates/x86/libcompiler_rt.a" +
+        " x86/libRSSupport.so:renderscript/lib/packaged/x86/libRSSupport.so" +
+        " x86/librsjni.so:renderscript/lib/packaged/x86/librsjni.so" +
+        " x86/librsjni_androidx.so:renderscript/lib/packaged/x86/librsjni_androidx.so" +
+        " x86/libblasV8.so:renderscript/lib/blas/x86/libblasV8.so" +
+        " x86/librsrt_x86.bc:renderscript/lib/bc/x86/libclcore.bc" +
+        " arm64/libc.so:renderscript/lib/intermediates/arm64-v8a/libc.so" +
+        " arm64/libm.so:renderscript/lib/intermediates/arm64-v8a/libm.so" +
+        " arm64/libcompiler_rt.a:renderscript/lib/intermediates/arm64-v8a/libcompiler_rt.a" +
+        " arm64/libRSSupport.so:renderscript/lib/packaged/arm64-v8a/libRSSupport.so" +
+        " arm64/librsjni.so:renderscript/lib/packaged/arm64-v8a/librsjni.so" +
+        " arm64/librsjni_androidx.so:renderscript/lib/packaged/arm64-v8a/librsjni_androidx.so" +
+        " arm64/libblasV8.so:renderscript/lib/blas/arm64-v8a/libblasV8.so" +
+        " arm64/librsrt_arm64.bc:renderscript/lib/bc/arm64-v8a/libclcore.bc" +
+        " x86_64/libc.so:renderscript/lib/intermediates/x86_64/libc.so" +
+        " x86_64/libm.so:renderscript/lib/intermediates/x86_64/libm.so" +
+        " x86_64/libcompiler_rt.a:renderscript/lib/intermediates/x86_64/libcompiler_rt.a" +
+        " x86_64/libRSSupport.so:renderscript/lib/packaged/x86_64/libRSSupport.so" +
+        " x86_64/librsjni.so:renderscript/lib/packaged/x86_64/librsjni.so" +
+        " x86_64/librsjni_androidx.so:renderscript/lib/packaged/x86_64/librsjni_androidx.so" +
+        " x86_64/libblasV8.so:renderscript/lib/blas/x86_64/libblasV8.so" +
+        " x86_64/librsrt_x86_64.bc:renderscript/lib/bc/x86_64/libclcore.bc",
+    srcs: ["lib/**/*"],
+    out: ["prebuilts.zip"],
+}
\ No newline at end of file
diff --git a/tools/Android.bp b/tools/Android.bp
index d9f3451a8..85d47a968 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -65,3 +65,72 @@ java_import {
     name: "sdk-core-lambda-stubs",
     jars: ["core-lambda-stubs.jar"],
 }
+
+genrule {
+    name: "build-tools-lld-linux",
+    visibility: ["//development/build"],
+    tools: ["soong_zip"],
+    cmd: "mkdir -p $(genDir)/out/{lld-bin,lib64} && " +
+        "cp $(location lld) $(genDir)/out/ && " +
+        "cp $(location lld-dummy) $(genDir)/out/arm-linux-androideabi-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/aarch64-linux-android-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/i686-linux-android-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/x86_64-linux-android-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/mipsel-linux-android-ld && " +
+        "cp $(location linux/lld-bin/lld) $(genDir)/out/lld-bin/ && " +
+        "cp $(location linux/lib64/libc++.so.1) $(genDir)/out/lib64/ && " +
+        "$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out",
+    srcs: [
+        "lld",
+        "lld-dummy",
+        "linux/lld-bin/lld",
+        "linux/lib64/libc++.so.1",
+    ],
+    out: ["lld.zip"],
+}
+
+genrule {
+    name: "build-tools-lld-windows",
+    visibility: ["//development/build"],
+    tools: ["soong_zip"],
+    cmd: "mkdir -p $(genDir)/out/{lld-bin,lib64} && " +
+        "cp $(location lld-dummy) $(genDir)/out/arm-linux-androideabi-ld.exe && " +
+        "cp $(location lld-dummy) $(genDir)/out/aarch64-linux-android-ld.exe && " +
+        "cp $(location lld-dummy) $(genDir)/out/i686-linux-android-ld.exe && " +
+        "cp $(location lld-dummy) $(genDir)/out/x86_64-linux-android-ld.exe && " +
+        "cp $(location lld-dummy) $(genDir)/out/mipsel-linux-android-ld.exe && " +
+        "cp $(location windows/lld-bin/lld.exe) $(genDir)/out/lld-bin/ && " +
+        "cp $(location windows/lld-bin/libwinpthread-1.dll) $(genDir)/out/lld-bin/ && " +
+        "$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out",
+    srcs: [
+        "lld-dummy",
+        "windows/lld-bin/lld.exe",
+        "windows/lld-bin/libwinpthread-1.dll",
+    ],
+    out: ["lld.zip"],
+}
+
+genrule {
+    name: "build-tools-lld-darwin",
+    visibility: ["//development/build"],
+    tools: ["soong_zip"],
+    cmd: "mkdir -p $(genDir)/out/{lld-bin,lib64} && " +
+        "cp $(location lld) $(genDir)/out/ && " +
+        "cp $(location lld-dummy) $(genDir)/out/arm-linux-androideabi-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/aarch64-linux-android-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/i686-linux-android-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/x86_64-linux-android-ld && " +
+        "cp $(location lld-dummy) $(genDir)/out/mipsel-linux-android-ld && " +
+        "cp $(location darwin/lld-bin/lld) $(genDir)/out/lld-bin/ && " +
+        "cp $(location darwin/lib64/libc++.1.dylib) $(genDir)/out/lib64/ && " +
+        "cp $(location darwin/lib64/libc++abi.1.dylib) $(genDir)/out/lib64/ && " +
+        "$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out",
+    srcs: [
+        "lld",
+        "lld-dummy",
+        "darwin/lld-bin/lld",
+        "darwin/lib64/libc++.1.dylib",
+        "darwin/lib64/libc++abi.1.dylib",
+    ],
+    out: ["lld.zip"],
+}
\ No newline at end of file