Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903

Bug: 166295507
Merged-In: I940b5608806ee58ce31295b6e6da81200772dc46
Change-Id: I70c611122b5b5dd92fc7c17a0ef560dcb0efba70

2 files changed, 38 insertions, 47 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..bcb6511
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,38 @@
+// Copyright (C) 2018 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_font {
+    name: "ZillaSlab-Medium.ttf",
+    src: "ZillaSlab-Medium.ttf",
+    product_specific: true,
+}
+
+prebuilt_font {
+    name: "ZillaSlab-MediumItalic.ttf",
+    src: "ZillaSlab-MediumItalic.ttf",
+    product_specific: true,
+}
+
+prebuilt_font {
+    name: "ZillaSlab-SemiBold.ttf",
+    src: "ZillaSlab-SemiBold.ttf",
+    product_specific: true,
+}
+
+prebuilt_font {
+    name: "ZillaSlab-SemiBoldItalic.ttf",
+    src: "ZillaSlab-SemiBoldItalic.ttf",
+    product_specific: true,
+}
+
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 4152b8c..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2018 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.
-
-# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FIES,
-# to copy over the NOTICE file.
-
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(SMALLER_FONT_FOOTPRINT),true)
-
-# Build the rest of font files as prebuilt.
-# $(1): The source file name in LOCAL_PATH.
-#       It also serves as the module name and the dest file name.
-define build-one-font-module
-$(eval include $(CLEAR_VARS))\
-$(eval LOCAL_MODULE := $(1))\
-$(eval LOCAL_SRC_FILES := $(1))\
-$(eval LOCAL_MODULE_CLASS := ETC)\
-$(eval LOCAL_MODULE_TAGS := optional)\
-$(eval LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/fonts)\
-$(eval LOCAL_PRODUCT_MODULE := true) \
-$(eval include $(BUILD_PREBUILT))
-endef
-
-font_src_files := \
-    ZillaSlab-Medium.ttf \
-    ZillaSlab-MediumItalic.ttf \
-    ZillaSlab-SemiBold.ttf \
-    ZillaSlab-SemiBoldItalic.ttf
-
-$(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
-
-build-one-font-module :=
-font_src_files :=
-
-endif