From 5ac489cda9ad2f8f9c2978b8307bba7744c3d831 Mon Sep 17 00:00:00 2001
From: Ruchit <risen@pixelexperience.org>
Date: Tue, 12 Mar 2024 21:13:48 +0530
Subject: [PATCH] doze: mk->bp

Fixes

FAILED: /home/risen/android/builds/pe/a52q/target/product/a52q/obj/APPS/SamsungDoze_intermediates/dexpreopt.sh
/bin/bash -c "/home/risen/android/builds/pe/a52q/host/linux-x86/bin/dexpreopt_gen -global_soong /home/risen/android/builds/pe/a52q/soong/dexpreopt_soong.config -global /home/risen/android/builds/pe/a52q/soong/dexpreopt_arm64/dexpreopt.config -module /home/risen/android/builds/pe/a52q/target/product/a52q/obj/APPS/SamsungDoze_intermediates/dexpreopt.config -dexpreopt_script /home/risen/android/builds/pe/a52q/target/product/a52q/obj/APPS/SamsungDoze_intermediates/dexpreopt.sh -out_dir /home/risen/android/builds/pe/a52q -product_packages /home/risen/android/builds/pe/a52q/target/product/a52q/obj/APPS/SamsungDoze_intermediates/product_packages.txt"
error: Path is outside directory: /home/risen/android/builds/pe/a52q/target/product/a52q/obj/APPS/SamsungDoze_intermediates/product_packages.txt

Change-Id: I503a688658a2879fc72180f370717f2d835c1efe
---
 Android.mk      |  1 -
 doze/Android.bp | 28 ++++++++++++++++++++++++++++
 doze/Android.mk | 36 ------------------------------------
 3 files changed, 28 insertions(+), 37 deletions(-)
 create mode 100644 doze/Android.bp
 delete mode 100644 doze/Android.mk

diff --git a/Android.mk b/Android.mk
index fc3385bf..9a975153 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,6 @@ endif
 
 ifeq ($(BOARD_VENDOR),samsung)
 include $(SAM_ROOT)/audio/Android.mk
-include $(SAM_ROOT)/doze/Android.mk
 include $(SAM_ROOT)/hidl/Android.mk
 include $(SAM_ROOT)/modemloader/Android.mk
 include $(SAM_ROOT)/ril/Android.mk
diff --git a/doze/Android.bp b/doze/Android.bp
new file mode 100644
index 00000000..a719893d
--- /dev/null
+++ b/doze/Android.bp
@@ -0,0 +1,28 @@
+//
+// Copyright (C) 2024 The Pixel Experience Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+android_app {
+    name: "SamsungDoze",
+    defaults: ["SettingsLibDefaults"],
+
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+
+    certificate: "platform",
+    platform_apis: true,
+    system_ext_specific: true,
+
+    static_libs: [
+        "androidx.window.extensions",
+        "androidx.window.sidecar",
+        "org.lineageos.platform.internal",
+        "org.lineageos.settings.resources",
+    ],
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+}
diff --git a/doze/Android.mk b/doze/Android.mk
deleted file mode 100644
index f5f9abc1..00000000
--- a/doze/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SamsungDoze
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    SettingsLib
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    org.lineageos.platform.internal
-
-LOCAL_OPTIONAL_USES_LIBRARIES := \
-    androidx.window.extensions \
-    androidx.window.sidecar
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/res \
-    $(TOP)/packages/resources/devicesettings/res
-
-ifneq ($(INCREMENTAL_BUILDS),)
-    LOCAL_PROGUARD_ENABLED := disabled
-    LOCAL_JACK_ENABLED := incremental
-endif
-
-include $(BUILD_PACKAGE)