Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96fc7a3d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move fontchain_lint to build/core/tasks" into main am: f6d0abc1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2919146



Change-Id: Id280b971b8f6e3eb6f23f272be01fc734bfe7356
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38588bdc f6d0abc1

data/fonts/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -57,3 +57,9 @@ prebuilt_etc { 
    name: "font_fallback.xml",

    src: "font_fallback.xml",

}



/////////////////////////////////

// Move `fontchain_lint` to `core/tasks/fontchain_lint.mk`.

// Because `system.img` is a dependency of `fontchain_lint`, it cannot be

// converted to Android.bp for now.

// After system.img can be generated by Soong, then it can be converted to Android.bp.

data/fonts/Android.mk

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
# 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 := $(call my-dir)



# Run sanity tests on fonts on checkbuild

checkbuild: fontchain_lint



FONTCHAIN_LINTER := $(HOST_OUT_EXECUTABLES)/fontchain_linter

ifeq ($(MINIMAL_FONT_FOOTPRINT),true)

CHECK_EMOJI := false

else

CHECK_EMOJI := true

endif



fontchain_lint_timestamp := $(call intermediates-dir-for,PACKAGING,fontchain_lint)/stamp



.PHONY: fontchain_lint

fontchain_lint: $(fontchain_lint_timestamp)



fontchain_lint_deps := \

    external/unicode/DerivedAge.txt \

    external/unicode/emoji-data.txt \

    external/unicode/emoji-sequences.txt \

    external/unicode/emoji-variation-sequences.txt \

    external/unicode/emoji-zwj-sequences.txt \

    external/unicode/additions/emoji-data.txt \

    external/unicode/additions/emoji-sequences.txt \

    external/unicode/additions/emoji-zwj-sequences.txt \



$(fontchain_lint_timestamp): $(FONTCHAIN_LINTER) $(TARGET_OUT)/etc/fonts.xml $(PRODUCT_OUT)/system.img $(fontchain_lint_deps)

	@echo Running fontchain lint

	$(FONTCHAIN_LINTER) $(TARGET_OUT) $(CHECK_EMOJI) external/unicode

	touch $@