From 1057669e0352cba40124826ff1773543a5803032 Mon Sep 17 00:00:00 2001
From: Victor Bo <bvoid@yandex.ru>
Date: Mon, 15 Feb 2021 23:19:08 -0500
Subject: [PATCH] fix gapps build

  remove commit trash after
  https://github.com/phhusson/device_phh_treble/commit/b2eea56e6c2c14878029acf69a35ebf3fd9bf7de

  FAILED:
  build/make/core/aapt2.mk:33: error: overriding commands for target
  `out/target/common/obj/APPS/SettingsProvider__auto_generated_rro_product_intermediates/flat-res/vendor/partner_gms/overlay/gms_overlay/frameworks/base/packages/SettingsProvider/res/values_defaults.arsc.flat',
  previously defined at build/make/core/aapt2.mk:27
  23:03:05 ckati failed with: exit status 1
---
 gapps.mk | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/gapps.mk b/gapps.mk
index 8b87f82..15e12a9 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -16,22 +16,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES := $(filter-out ro.boot.vendor.overlay.theme=%,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES))
 endif
 
-ifneq ($(wildcard vendor/partner_gms),)
--include vendor/partner_gms/products/gms.mk
-PRODUCT_SHIPPING_API_LEVEL :=
-
-PRODUCT_PACKAGES := $(filter-out CalendarGoogle, $(PRODUCT_PACKAGES))
-PRODUCT_PACKAGES := $(filter-out GoogleContacts, $(PRODUCT_PACKAGES))
-
-PRODUCT_PACKAGES += \
-	phh-gapps-overrides \
-	Chrome \
-	GoogleContactsSyncAdapter \
-	talkback \
-
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES := $(filter-out ro.boot.vendor.overlay.theme=%,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES))
-endif
-
 ifneq ($(wildcard vendor/opengapps),)
 PRODUCT_COPY_FILES += \
 	device/phh/treble/empty-permission.xml:system/etc/permissions/com.google.android.camera2.xml \