diff options
author | Roozbeh Pournader <roozbeh@google.com> | 2015-08-18 12:19:19 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2015-08-18 12:55:38 -0700 |
commit | e879d165039e1c1e328c5d2c1f84f4f25e01bea0 (patch) | |
tree | 4225d4705d8e4fae3e4c6edb38d3367b6ec99481 | |
parent | 6def8bbf163ba6f8daec342d9ed7fff61f9e3a8e (diff) | |
download | naver-fonts-android-6.0.0_r1.tar.gz |
Revert "Create a special CONSTRAINED font bucket in naver-fonts."android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-cts-release
This reverts commit 343edd99ca4fa28e91e45bdeae57cdce4813f555.
Bug: 22929087
-rw-r--r-- | Android.mk | 28 | ||||
-rw-r--r-- | fonts.mk | 20 |
2 files changed, 0 insertions, 48 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 5dd0d23..0000000 --- a/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2012 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) - -ifeq ($(CONSTRAINED_FONT_FOOTPRINT),true) -include $(CLEAR_VARS) -LOCAL_MODULE := NanumGothic.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) -endif # CONSTRAINED_FONT_FOOTPRINT diff --git a/fonts.mk b/fonts.mk deleted file mode 100644 index 3a491d3..0000000 --- a/fonts.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2012 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 PRODUCT_PACKAGES (together with BUILD_PREBUILT) instead of -# PRODUCT_COPY_FILES to install the font files, so that the NOTICE file can -# get installed too. - -PRODUCT_PACKAGES := \ - NanumGothic.ttf |