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

Commit c694d046 authored by Ian Lake's avatar Ian Lake
Browse files

Remove AppCompat from TouchLatency test 

Ensure the TouchLatency test accurately reflects the latest
framework and removes the need to update TouchLatency test
as Support Library evolves.

Test: ./gradlew assembleDebug works
BUG: 28983951
Change-Id: Icce773f47674f94cad5f9057cce4913b7efce834
parent de295549

tests/TouchLatency/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
/.idea

.DS_Store

/build

.iml

tests/TouchLatency/Android.mk

+2 −10
Original line number Diff line number Diff line
@@ -8,19 +8,11 @@ LOCAL_MANIFEST_FILE := app/src/main/AndroidManifest.xml 
# omit gradle 'build' dir

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



# use appcompat/support lib from the tree, so improvements/

# regressions are reflected in test data

LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/app/src/main/res \

    frameworks/support/v7/appcompat/res

    $(LOCAL_PATH)/app/src/main/res



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages android.support.v7.appcompat



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-appcompat

    --auto-add-overlay



LOCAL_PACKAGE_NAME := TouchLatency

tests/TouchLatency/TouchLatency.iml

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">

  <component name="FacetManager">

    <facet type="java-gradle" name="Java-Gradle">

      <configuration>

        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />

        <option name="BUILDABLE" value="false" />

      </configuration>

    </facet>

  </component>

  <component name="NewModuleRootManager" inherit-compiler-output="true">

    <exclude-output />

    <content url="file://$MODULE_DIR$">

      <excludeFolder url="file://$MODULE_DIR$/.gradle" />

    </content>

    <orderEntry type="inheritedJdk" />

    <orderEntry type="sourceFolder" forTests="false" />

  </component>

</module>
 
 No newline at end of file

tests/TouchLatency/app/app.iml

deleted100644 → 0
+0 −92
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TouchLatency" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">

  <component name="FacetManager">

    <facet type="android-gradle" name="Android-Gradle">

      <configuration>

        <option name="GRADLE_PROJECT_PATH" value=":app" />

      </configuration>

    </facet>

    <facet type="android" name="Android">

      <configuration>

        <option name="SELECTED_BUILD_VARIANT" value="debug" />

        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />

        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />

        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />

        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />

        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />

        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />

        <option name="ALLOW_USER_CONFIGURATION" value="false" />

        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />

        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />

        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />

        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />

      </configuration>

    </facet>

  </component>

  <component name="NewModuleRootManager" inherit-compiler-output="false">

    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />

    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />

    <exclude-output />

    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />

      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />

      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />

    </content>

    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />

    <orderEntry type="sourceFolder" forTests="false" />

    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />

    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />

    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />

  </component>

</module>
 
 No newline at end of file

tests/TouchLatency/app/build.gradle

+0 −5
Original line number Diff line number Diff line
@@ -18,8 +18,3 @@ android { 
        }

    }

}
 


dependencies {

    compile fileTree(dir: 'libs', include: ['*.jar'])

    compile 'com.android.support:appcompat-v7:21.0.3'

}