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

Commit 11c1df3e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "bt-test-setup-robolectric-test" 

* changes:
  Move instrumentation tests to tests/unit directory (2/2)
  Move instrumentation tests to tests/unit directory (1/2)
parents 8751f262 70328a8a

android/app/tests/Android.mk

100755 → 100644
+3 −28
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests

LOCAL_CERTIFICATE := platform



LOCAL_JAVA_LIBRARIES := \

    javax.obex \

    android.test.runner \

    telephony-common \

    libprotobuf-java-micro



LOCAL_STATIC_JAVA_LIBRARIES :=  \

    com.android.emailcommon \

    android-support-test \

    mockito-target \

    legacy-android-test \

    espresso-intents



# Include all test java files.

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



LOCAL_PACKAGE_NAME := BluetoothInstrumentationTests



LOCAL_COMPATIBILITY_SUITE := device-tests



LOCAL_INSTRUMENTATION_FOR := Bluetooth



include $(BUILD_PACKAGE)
 
# Include all makefiles in subdirectories

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

android/app/tests/unit/Android.mk

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

include $(CLEAR_VARS)



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests

LOCAL_CERTIFICATE := platform



LOCAL_JAVA_LIBRARIES := \

    javax.obex \

    android.test.runner \

    telephony-common \

    libprotobuf-java-micro



LOCAL_STATIC_JAVA_LIBRARIES :=  \

    com.android.emailcommon \

    android-support-test \

    mockito-target \

    legacy-android-test \

    espresso-intents



# Include all test java files.

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



LOCAL_PACKAGE_NAME := BluetoothInstrumentationTests



LOCAL_COMPATIBILITY_SUITE := device-tests



LOCAL_INSTRUMENTATION_FOR := Bluetooth



include $(BUILD_PACKAGE)