Merge "Change build targets for settings tests"

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 := android.test.runner bouncycastle

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target

# Include all test java files.

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

LOCAL_PACKAGE_NAME := SettingsTests

LOCAL_INSTRUMENTATION_FOR := Settings

include $(BUILD_PACKAGE)

# Include all makefiles in subdirectories

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

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 := android.test.runner bouncycastle

# Include all test java files.

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

LOCAL_PACKAGE_NAME := SettingsTests

LOCAL_INSTRUMENTATION_FOR := Settings

include $(BUILD_PACKAGE)

        </activity>

    </application>

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="android.test.InstrumentationTestRunner"

        android:targetPackage="com.android.settings"

        android:label="Settings Test Cases">

        android:label="Settings App Tests">

    </instrumentation>

    <instrumentation android:name="SettingsLaunchPerformance"

        android:targetPackage="com.android.settings"

        android:label="Settings Launch Performance">

    </instrumentation>

</manifest>