From d5e7962c84ccfc86eb1da66e47a168a1dbd30348 Mon Sep 17 00:00:00 2001
From: Joey <joey@lineageos.org>
Date: Wed, 17 May 2023 20:55:33 +0200
Subject: [PATCH] sdk: remove aar target

The aar target not only is broken, but it has become useless
since there's no resource in the sdk/res/res path.
A working aar would be no different than the jar produced
by the "org.lineageos.platform.sdk" target.

Change-Id: I06c482c5cacab035cd1dad96a7760d4d6cf24ebf
---
 Android.mk              | 25 +------------------------
 sdk/AndroidManifest.xml | 22 ----------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 sdk/AndroidManifest.xml

diff --git a/Android.mk b/Android.mk
index d4247595..412ce301 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2015 The CyanogenMod Project
-#               2017-2022 The LineageOS Project
+#               2017-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,29 +43,6 @@ $(lineage_framework_module): | $(dir $(lineage_framework_module))org.lineageos.p
 
 lineage_framework_built := $(call java-lib-deps, org.lineageos.platform)
 
-# the sdk as an aar for publish, not built as part of full target
-# DO NOT LINK AGAINST THIS IN BUILD
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := org.lineageos.platform.sdk.aar
-
-LOCAL_JACK_ENABLED := disabled
-
-LOCAL_CONSUMER_PROGUARD_FILE := $(LOCAL_PATH)/sdk/proguard.txt
-
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res)
-LOCAL_MANIFEST_FILE := sdk/AndroidManifest.xml
-
-lineage_sdk_exclude_files := 'lineageos/library'
-LOCAL_JAR_EXCLUDE_PACKAGES := $(lineage_sdk_exclude_files)
-LOCAL_JAR_EXCLUDE_FILES := none
-
-LOCAL_STATIC_JAVA_LIBRARIES := org.lineageos.platform.sdk
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-$(LOCAL_MODULE) : $(built_aar)
-
 # ===========================================================
 # Common Droiddoc vars
 lineage_platform_docs_src_files := \
diff --git a/sdk/AndroidManifest.xml b/sdk/AndroidManifest.xml
deleted file mode 100644
index cd8e2183..00000000
--- a/sdk/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright 2016, CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="lineageos.library">
-    <uses-sdk android:minSdkVersion="4" />
-</manifest>