Snap for 6439596 from f05cc74df3ac03c38fc5325305adccae811e0fc6 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: Ib8e2727cf41ad5719ada74327d6d64d7cfa84706

4 files changed, 35 insertions, 26 deletions

diff --git a/arm64/4.14/kernel-qemu2 b/arm64/4.14/kernel-qemu2
deleted file mode 100644
index 5b5c6a2..0000000
--- a/arm64/4.14/kernel-qemu2
+++ /dev/null
diff --git a/x86/pc-bios/Android.bp b/x86/pc-bios/Android.bp
deleted file mode 100644
index 02b6f14..0000000
--- a/x86/pc-bios/Android.bp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright (C) 2011 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-prebuilt_usr_share_host {
-    name: "bios.bin",
-    src: "bios.bin",
-    sub_dir: "pc-bios",
-}
-
-prebuilt_usr_share_host {
-    name: "vgabios-cirrus.bin",
-    src: "vgabios-cirrus.bin",
-    sub_dir: "pc-bios",
-}
diff --git a/x86/pc-bios/Android.mk b/x86/pc-bios/Android.mk
new file mode 100644
index 0000000..9c99865
--- /dev/null
+++ b/x86/pc-bios/Android.mk
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := bios.bin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/pc-bios
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := vgabios-cirrus.bin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/pc-bios
+include $(BUILD_PREBUILT)
+
diff --git a/x86_64/4.14/kernel-qemu2 b/x86_64/4.14/kernel-qemu2
index bafef83..8250c35 100644
--- a/x86_64/4.14/kernel-qemu2
+++ b/x86_64/4.14/kernel-qemu2