support: Build custom vendor support [1/2]
switch to Android.bp and androidx
Change-Id: I0e22ba70e955fc6698510315452c6f07098927ac
diff --git a/Android.bp b/Android.bp
index 9732785..d0c78eb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,37 +1,21 @@
android_library {
- name: "BlissSupportLib",
+ name: "VendorSupport-preference",
+
+ optimize: {
+ enabled: false,
+ },
+
+ srcs: ["src/**/*.java"],
static_libs: [
- "androidx.annotation_annotation",
- "androidx.legacy_legacy-support-v4",
- "androidx.recyclerview_recyclerview",
+ "androidx.core_core",
"androidx.preference_preference",
"androidx.appcompat_appcompat",
- "androidx.lifecycle_lifecycle-runtime",
+ "androidx.recyclerview_recyclerview",
"org.lineageos.platform.internal",
],
resource_dirs: ["res"],
- srcs: ["src/**/*.java"],
-
- min_sdk_version: "27",
-
-}
-
-// NOTE: Keep this module in sync with ./common.mk
-java_defaults {
- name: "BlissSupportLibDefaults",
- static_libs: [
- "androidx.annotation_annotation",
- "androidx.lifecycle_lifecycle-common",
- "androidx.legacy_legacy-support-v4",
- "androidx.lifecycle_lifecycle-runtime",
- "androidx.recyclerview_recyclerview",
- "androidx.preference_preference",
- "androidx.appcompat_appcompat",
- "androidx.legacy_legacy-preference-v14",
- "BlissSupportLib",
- ],
}
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 42b1d03..0000000
--- a/common.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Include this make file to build your application against this module.
-#
-# Make sure to include it after you've set all your desired LOCAL variables.
-# Note that you must explicitly set your LOCAL_RESOURCE_DIR before including
-# this file.
-#
-# For example:
-#
-# LOCAL_RESOURCE_DIR := \
-# $(LOCAL_PATH)/res
-#
-# include vendor/support/common.mk
-#
-
-LOCAL_STATIC_JAVA_LIBRARIES += \
- androidx.annotation_annotation \
- androidx.lifecycle_lifecycle-common
-
-LOCAL_STATIC_ANDROID_LIBRARIES += \
- androidx.legacy_legacy-support-v4 \
- androidx.lifecycle_lifecycle-runtime \
- androidx.recyclerview_recyclerview \
- androidx.preference_preference \
- androidx.appcompat_appcompat \
- androidx.legacy_legacy-preference-v14 \
- BlissSupportLib
-