commit 9541855d6a871f6409925f574863ba3672586dd1
author maxwen <max.weninger@gmail.com> Tue Oct 12 23:31:16 2021 +0200
committer maxwen <max.weninger@gmail.com> Tue Oct 19 16:20:05 2021 +0200
tree b00a17a767c74503ea4b423e28263b33646bb74f
parent f8259097730d1b72c4b618914e5ce3b05e84f9d9

omni: delete old dimen resources and fix properties

Change-Id: Idc4574494aa1a95cb5cb0f807c5cf5cc15ea6feb

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 7e79d25..ee23994 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -10,10 +10,10 @@
 endif
 
 ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.com.google.clientidbase=android-google
 else
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
 endif
 
@@ -21,7 +21,7 @@
 PRODUCT_RESTRICT_VENDOR_FILES := false
 
 # general properties
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
     ro.com.android.wifi-watchlist=GoogleGuest \
     ro.setupwizard.enterprise_mode=1 \
@@ -29,16 +29,16 @@
     persist.sys.disable_rescue=true
 
 # Google assistant
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.opa.eligible_device=true
 
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     net.tethering.noprovisioning=true
 
 # Enforce privapp-permissions whitelist
-OMNI_PRODUCT_PROPERTIES += \
+#OMNI_PRODUCT_PROPERTIES += \
     ro.control_privapp_permissions=enforce
 
 PRODUCT_COPY_FILES += \
@@ -79,7 +79,7 @@
     vendor/omni/prebuilt/etc/permissions/omni-power-whitelist.xml:system/etc/sysconfig/omni-power-whitelist.xml
 
 # custom omni sounds
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=omni_ringtone1.ogg \
     ro.config.notification_sound=omni_notification1.ogg \
     ro.config.alarm_alert=omni_alarm1.ogg
@@ -104,7 +104,7 @@
     vendor/omni/prebuilt/etc/mkshrc:system/etc/mkshrc
 
 # whitelist packages for location providers not in system
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.services.whitelist.packagelist=com.google.android.gms
 
 PRODUCT_COPY_FILES += \

config/packages.mk

diff --git a/config/packages.mk b/config/packages.mk
index 2c4803f..7eb0581 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -6,9 +6,7 @@
     OmniStyle \
     MatLog \
     OmniChange \
-    OmniOverlayStub \
     OmniStoreInstallerPrebuilt \
-    omni-overlays \
     OpenDelta \
     ThemePicker \
     SystemWebView \
@@ -34,6 +32,10 @@
     vncpasswd \
     OmniRemote
 
+#PRODUCT_PACKAGES += \
+    OmniOverlayStub \
+    omni-overlays
+
 ifeq ($(BOARD_INCLUDE_CMDLINE_TOOLS),true)
 PRODUCT_PACKAGES += \
     htop \
@@ -51,8 +53,8 @@
 endif
 
 # Telephony extension
-PRODUCT_PACKAGES += telephony-ext
-PRODUCT_BOOT_JARS += telephony-ext
+#PRODUCT_PACKAGES += telephony-ext
+#PRODUCT_BOOT_JARS += telephony-ext
 
 # for fun
 #PRODUCT_PACKAGES += \

config/version.mk

diff --git a/config/version.mk b/config/version.mk
index 731fa53..2551d84 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -25,6 +25,6 @@
 endif
 
 # Apply it to build.prop
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.modversion=OmniROM-$(ROM_VERSION) \
     ro.omni.version=$(ROM_VERSION)