From db3e391e20b0afb4bcf8f6f03745b4b695ae5cba Mon Sep 17 00:00:00 2001 From: Jay Aliomer Date: Wed, 22 Apr 2020 16:05:21 -0400 Subject: [PATCH 1/2] Adding style packages/fonts adding the pixel 2020 styles and fonts Bug: 145530620 Bug: 145529629 Test: test the styles app Change-Id: I0cd7a40ad77b772fcba49232cb9d19f1258e3028 --- target/product/handheld_system.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk index 77c103d7ee..31a8a036f2 100644 --- a/target/product/handheld_system.mk +++ b/target/product/handheld_system.mk @@ -25,6 +25,11 @@ $(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts. $(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk) $(call inherit-product-if-exists, external/google-fonts/cutive-mono/fonts.mk) $(call inherit-product-if-exists, external/google-fonts/source-sans-pro/fonts.mk) +$(call inherit-product-if-exists, external/google-fonts/lustria/fonts.mk) +$(call inherit-product-if-exists, external/google-fonts/barlow/fonts.mk) +$(call inherit-product-if-exists, external/google-fonts/fraunces/fonts.mk) +$(call inherit-product-if-exists, external/google-fonts/karla/fonts.mk) +$(call inherit-product-if-exists, external/google-fonts/big-shoulders-text/fonts.mk) $(call inherit-product-if-exists, external/noto-fonts/fonts.mk) $(call inherit-product-if-exists, external/roboto-fonts/fonts.mk) $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk) From d322d8d817bcbd3cbe5ad0a6121e76123a299101 Mon Sep 17 00:00:00 2001 From: Kun Niu Date: Thu, 14 May 2020 16:32:29 -0700 Subject: [PATCH 2/2] package llvm-profdata in mainline_module_x86_coverage build target. Test: local build succeed. Bug: 156165375 Change-Id: I903ca33a839ea25c39bef96f949ded78aacf5609 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index e2d096db18..e9d07bf709 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4903,7 +4903,7 @@ ifeq (true,$(CLANG_COVERAGE)) $(PROFDATA_ZIP): $(SOONG_ZIP) $(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX) - $(call dist-for-goals,droidcore,$(PROFDATA_ZIP)) + $(call dist-for-goals,droidcore apps_only,$(PROFDATA_ZIP)) endif # -----------------------------------------------------------------