Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aedd800f authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Etar: Blueprint updates 



- Update paths to sources after gradle updates
- Migrate tests to blueprint and drop makefiles completely

Signed-off-by: default avatarAayush Gupta <aayushgupta219@gmail.com>
Change-Id: I1de536e3e2ae827f9c3d2145c2127d2fb9bc8b24
parent dfc1a290

Android.bp

+25 −4
Original line number Diff line number Diff line
@@ -2,15 +2,17 @@ android_app { 
    name: "Etar",

    overrides: ["Calendar"],



    resource_dirs: ["res"],

    resource_dirs: ["app/src/main/res"],



    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "app/src/main/java/**/*.kt",

        "app/src/main/java/**/*.java",

        "src_aosp/**/*.java",

        "src_aosp/**/*.kt",

    ],



    manifest: "app/src/main/AndroidManifest.xml",



    product_specific: true,



    static_libs: [
@@ -28,7 +30,7 @@ android_app { 
    ],



    optimize: {

        proguard_flags_files: ["proguard.flags"],

        proguard_flags_files: ["app/proguard-rules.pro"],

    },



    sdk_version: "current",
@@ -43,6 +45,25 @@ android_app { 
    ],

}



android_test {

    name: "CalendarTests",



    srcs: [

        "app/src/test/java/**/*.kt",

        "app/src/test/java/**/*.java",

    ],



    manifest: "app/src/test/AndroidManifest.xml",



    libs: [

        "android.test.runner",

    ],



    certificate: "platform",



    instrumentation_for: "Etar",

}



prebuilt_etc {

    name: "org.lineageos.etar.allowlist",

    product_specific: true,

Android.mk

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(call all-makefiles-under,$(LOCAL_PATH))

tests/Android.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.calendar.*



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests



LOCAL_STATIC_JAVA_LIBRARIES := android.test.runner



# Include all test java files.

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := CalendarTests



LOCAL_INSTRUMENTATION_FOR := Etar



# unbundled

LOCAL_STATIC_JAVA_LIBRARIES := android-common

LOCAL_SDK_VERSION := 16



include $(BUILD_PACKAGE)