Update VNDK snapshot v27 to use ld.cofig.txt template
Taken from branch oc-mr1-treble-dev.
To use ld.config.txt template instead of prebuilt file, update the file
names and Android.bp file.
Bug: 74658756
Bug: 123209911
Test: PRODUCT_EXTRA_VNDK_VERSIONS=27 m -j vndk_snapshot_package
Change-Id: I74bdd809a8b631b8e25476bcd1a1cc50abff1d9e
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",
},
},
}
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
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
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
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
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
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
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
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
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
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
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
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
