diff --git a/BlissLauncher/Android.mk b/BlissLauncher/Android.mk index 1b193e0508219d78d06cca0a304e783396779a78..9bcb47922e131a73d6ff062869eca5ef0f4051e1 100644 --- a/BlissLauncher/Android.mk +++ b/BlissLauncher/Android.mk @@ -4,6 +4,15 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := BlissLauncher LOCAL_CERTIFICATE := platform +# the ok part is necessary: https://stackoverflow.com/questions/3442304/performing-greater-than-less-than-calculations-in-a-makefile/44288938#44288938 +$(if $(shell [ $(PLATFORM_SDK_VERSION) -ge 29 ] && echo "ok"), \ + $(eval BUILD_GREATER_THAN_PIE := true), \ + $(eval BUILD_GREATER_THAN_PIE := false)) + +ifeq ($(BUILD_GREATER_THAN_PIE),true) + LOCAL_OVERRIDES_PACKAGES := Trebuchet TrebuchetQuickStep +endif + ifeq ($(PLATFORM_SDK_VERSION), 25) LOCAL_SRC_FILES := app-apiNougat-release-unsigned.apk else @@ -13,4 +22,17 @@ endif LOCAL_MODULE_CLASS := APPS LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) +ifeq ($(BUILD_GREATER_THAN_PIE),true) + LOCAL_REQUIRED_MODULES := privapp_whitelist_foundation.e.blisslauncher.xml + include $(BUILD_PREBUILT) + + include $(CLEAR_VARS) + LOCAL_MODULE := privapp_whitelist_foundation.e.blisslauncher.xml + LOCAL_MODULE_CLASS := ETC + LOCAL_MODULE_TAGS := optional + LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions + LOCAL_PRODUCT_MODULE := true + LOCAL_SRC_FILES := $(LOCAL_MODULE) +endif + include $(BUILD_PREBUILT) diff --git a/BlissLauncher/privapp_whitelist_foundation.e.blisslauncher.xml b/BlissLauncher/privapp_whitelist_foundation.e.blisslauncher.xml new file mode 100644 index 0000000000000000000000000000000000000000..98c199fed620f1d636385a1f47f0e51ddaa110fd --- /dev/null +++ b/BlissLauncher/privapp_whitelist_foundation.e.blisslauncher.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file