commit 9570aa815a34c2ec17235c276092d37cd734e8f0
author Justin Yun <justinyun@google.com> Wed Jan 23 18:56:28 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 23 18:56:28 2019 -0800
tree 34910f2f4131bbac9293f5730ddff6e44b568d36
parent a1fa14725d82ee26acdc58e3cff72a62aae79c9a
parent a9c8817ecab0154c12269083f1de8ed724523e57

Update VNDK snapshot v27 to use ld.cofig.txt template
am: a9c8817eca

Change-Id: Ibb802a91782942ba15c79b95775c3c2d93dce1d3

Android.bp

diff --git a/Android.bp b/Android.bp
index 5b5ee52..f9fd83b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,37 +2,19 @@
 // DO NOT EDIT
 
 prebuilt_etc {
-    name: "ld.config.27.txt",
-    target: {
-        android_arm64: {
-            src: "arm64/configs/ld.config.txt",
-        },
-        android_arm: {
-            src: "arm/configs/ld.config.txt",
-        },
-        android_x86_64: {
-            src: "x86_64/configs/ld.config.txt",
-        },
-        android_x86: {
-            src: "x86/configs/ld.config.txt",
-        },
-    },
-}
-
-prebuilt_etc {
     name: "llndk.libraries.27.txt",
     target: {
         android_arm64: {
-            src: "arm64/configs/llndk.libraries.txt",
+            src: "arm64/configs/llndk.libraries.27.txt",
         },
         android_arm: {
-            src: "arm/configs/llndk.libraries.txt",
+            src: "arm/configs/llndk.libraries.27.txt",
         },
         android_x86_64: {
-            src: "x86_64/configs/llndk.libraries.txt",
+            src: "x86_64/configs/llndk.libraries.27.txt",
         },
         android_x86: {
-            src: "x86/configs/llndk.libraries.txt",
+            src: "x86/configs/llndk.libraries.27.txt",
         },
     },
 }
@@ -41,16 +23,16 @@
     name: "vndksp.libraries.27.txt",
     target: {
         android_arm64: {
-            src: "arm64/configs/vndksp.libraries.txt",
+            src: "arm64/configs/vndksp.libraries.27.txt",
         },
         android_arm: {
-            src: "arm/configs/vndksp.libraries.txt",
+            src: "arm/configs/vndksp.libraries.27.txt",
         },
         android_x86_64: {
-            src: "x86_64/configs/vndksp.libraries.txt",
+            src: "x86_64/configs/vndksp.libraries.27.txt",
         },
         android_x86: {
-            src: "x86/configs/vndksp.libraries.txt",
+            src: "x86/configs/vndksp.libraries.27.txt",
         },
     },
 }

arm/configs/ld.config.27.txt

diff --git a/arm/configs/ld.config.txt b/arm/configs/ld.config.27.txt
similarity index 100%
rename from arm/configs/ld.config.txt
rename to arm/configs/ld.config.27.txt

arm/configs/llndk.libraries.27.txt

diff --git a/arm/configs/llndk.libraries.txt b/arm/configs/llndk.libraries.27.txt
similarity index 100%
rename from arm/configs/llndk.libraries.txt
rename to arm/configs/llndk.libraries.27.txt

arm/configs/vndksp.libraries.27.txt

diff --git a/arm/configs/vndksp.libraries.txt b/arm/configs/vndksp.libraries.27.txt
similarity index 100%
rename from arm/configs/vndksp.libraries.txt
rename to arm/configs/vndksp.libraries.27.txt

arm64/configs/ld.config.27.txt

diff --git a/arm64/configs/ld.config.txt b/arm64/configs/ld.config.27.txt
similarity index 100%
rename from arm64/configs/ld.config.txt
rename to arm64/configs/ld.config.27.txt

arm64/configs/llndk.libraries.27.txt

diff --git a/arm64/configs/llndk.libraries.txt b/arm64/configs/llndk.libraries.27.txt
similarity index 100%
rename from arm64/configs/llndk.libraries.txt
rename to arm64/configs/llndk.libraries.27.txt

arm64/configs/vndksp.libraries.27.txt

diff --git a/arm64/configs/vndksp.libraries.txt b/arm64/configs/vndksp.libraries.27.txt
similarity index 100%
rename from arm64/configs/vndksp.libraries.txt
rename to arm64/configs/vndksp.libraries.27.txt

x86/configs/ld.config.27.txt

diff --git a/x86/configs/ld.config.txt b/x86/configs/ld.config.27.txt
similarity index 100%
rename from x86/configs/ld.config.txt
rename to x86/configs/ld.config.27.txt

x86/configs/llndk.libraries.27.txt

diff --git a/x86/configs/llndk.libraries.txt b/x86/configs/llndk.libraries.27.txt
similarity index 100%
rename from x86/configs/llndk.libraries.txt
rename to x86/configs/llndk.libraries.27.txt

x86/configs/vndksp.libraries.27.txt

diff --git a/x86/configs/vndksp.libraries.txt b/x86/configs/vndksp.libraries.27.txt
similarity index 100%
rename from x86/configs/vndksp.libraries.txt
rename to x86/configs/vndksp.libraries.27.txt

x86_64/configs/ld.config.27.txt

diff --git a/x86_64/configs/ld.config.txt b/x86_64/configs/ld.config.27.txt
similarity index 100%
rename from x86_64/configs/ld.config.txt
rename to x86_64/configs/ld.config.27.txt

x86_64/configs/llndk.libraries.27.txt

diff --git a/x86_64/configs/llndk.libraries.txt b/x86_64/configs/llndk.libraries.27.txt
similarity index 100%
rename from x86_64/configs/llndk.libraries.txt
rename to x86_64/configs/llndk.libraries.27.txt

x86_64/configs/vndksp.libraries.27.txt

diff --git a/x86_64/configs/vndksp.libraries.txt b/x86_64/configs/vndksp.libraries.27.txt
similarity index 100%
rename from x86_64/configs/vndksp.libraries.txt
rename to x86_64/configs/vndksp.libraries.27.txt