diff --git a/metadata/com.android2.calculator3.txt b/metadata/com.android2.calculator3.txt
index 68e2fe4fed..124fb1c2bf 100644
--- a/metadata/com.android2.calculator3.txt
+++ b/metadata/com.android2.calculator3.txt
@@ -73,9 +73,10 @@ Build:v3.4.2,49
target=android-17
Build:4.3,63
- disable=google glass and wearable jars
+ disable=testing
commit=7ad3de71422a75b7c3865835b53cf1f6ca64a6ce
subdir=Calculator
+ patch=glassless-manifest.patch
gradle=yes
srclibs=EJML@v0.25,Google-Gson@gson-2.2.4,Slider@00020deb7fa5499bb33cc4471af2bd5256d10e78,ArityXlythe@459535ba5005c6f3a03101b15354e44df161a637
rm=Calculator/libs/slider.jar,Calculator/libs/ejml*jar,Calculator/libs/gson*jar,Calculator/libs/wearable-preview-support.jar,Calculator/libs/gdk.jar,Calculator/libs/arity-2.1.6.jar
@@ -101,13 +102,15 @@ Build:4.3,63
jar cf arity.jar org && \
popd && \
cp $$ArityXlythe$$/bin/arity.jar libs/ && \
- cp $$SDK$$/add-ons/addon-google_gdk-google-19/libs/gdk.jar libs/
+ echo cp $$SDK$$/add-ons/addon-google_gdk-google-19/libs/gdk.jar libs/ && \
+ rm src/main/java/com/android2/calculator3/GlassHomeActivity.java src/main/java/com/android2/calculator3/GlassResultActivity.java
Maintainer Notes:
* REPLACED gson-2.2.4.jar with source-build 2.2.4 from upstream.
* REPLACED ejml-0.21.jar with source-build 0.25 from upsteam.
* REPLACED arity-2.1.6.jar with source-build from app author as upstream is no longer available.
-* REPLACED gdk.jar with file from Android Glass Development Kit.
+# REPLACED gdk.jar with file from Android Glass Development Kit.
+* REMOVED gdk.jar and removed references from source.
* REPLACED slider.jar with source-build latest from upstream
* REMOVED wearable-preview-support.jar -- builds, but does it run?
.
diff --git a/metadata/com.android2.calculator3/glassless-manifest.patch b/metadata/com.android2.calculator3/glassless-manifest.patch
new file mode 100644
index 0000000000..a0357e70ef
--- /dev/null
+++ b/metadata/com.android2.calculator3/glassless-manifest.patch
@@ -0,0 +1,28 @@
+diff --git a/Calculator/src/main/AndroidManifest.xml b/Calculator/src/main/AndroidManifest.xml
+index 8a73ac9..1bc6521 100644
+--- a/Calculator/src/main/AndroidManifest.xml
++++ b/Calculator/src/main/AndroidManifest.xml
+@@ -52,23 +52,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-