Merge "Revert "Fix math.rs"" am: 4205ce7fcc am: e053434a15 am: 993abbf43c
am: 870d318adf
Change-Id: Ia63c6157f45d52f2e7052988432aaeb3cd6c819a
diff --git a/Android.bp b/Android.bp
index 4d05b23..5ea81fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,12 @@
"libbcinfo",
],
+
+ product_variables: {
+ pdk: {
+ enabled: false,
+ },
+ },
}
// Build rsg-generator ====================
@@ -202,6 +208,9 @@
override_rs_driver: {
cflags: ["-DOVERRIDE_RS_DRIVER=%s"],
},
+ pdk: {
+ enabled: false,
+ },
},
}
@@ -234,6 +243,12 @@
"libandroid_runtime",
],
+ product_variables: {
+ pdk: {
+ enabled: false,
+ },
+ },
+
static_libs: ["libRSDispatch"],
version_script: "libRS.map",
diff --git a/tests/java_api/RsTest/AndroidTest.xml b/tests/java_api/RsTest/AndroidTest.xml
index 7db6f8b..0a27608 100644
--- a/tests/java_api/RsTest/AndroidTest.xml
+++ b/tests/java_api/RsTest/AndroidTest.xml
@@ -20,7 +20,7 @@
<option name="test-suite-tag" value="apct" />
<option name="test-tag" value="RSTest" />
- <test class="com.android.tradefed.testtype.InstrumentationTest" >
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.rs.test" />
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
</test>
