Skip to content

Commit

Permalink
sdk: remove aar target
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bvlj committed May 17, 2023
1 parent 528400a commit d5e7962
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 46 deletions.
25 changes: 1 addition & 24 deletions Android.mk
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 := \
Expand Down
22 changes: 0 additions & 22 deletions sdk/AndroidManifest.xml

This file was deleted.

0 comments on commit d5e7962

Please sign in to comment.