From 259f98c8110777ed0c3e9f022cd6bbdcfc736e0d Mon Sep 17 00:00:00 2001
From: Bjørn Mork <bjorn@mork.no>
Date: Thu, 16 May 2019 19:50:45 +0200
Subject: android: add .android domain component
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 Defogger/AndroidManifest.xml                          |  4 ++--
 Defogger/Makefile                                     | 19 ++++++++++---------
 .../src/no/mork/android/defogger/MainActivity.java    | 12 ++++++++++++
 Defogger/src/no/mork/defogger/MainActivity.java       | 12 ------------
 4 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 Defogger/src/no/mork/android/defogger/MainActivity.java
 delete mode 100644 Defogger/src/no/mork/defogger/MainActivity.java

diff --git a/Defogger/AndroidManifest.xml b/Defogger/AndroidManifest.xml
index 3258766..6a32114 100644
--- a/Defogger/AndroidManifest.xml
+++ b/Defogger/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
-<manifest xmlns:a='http://schemas.android.com/apk/res/android' package='no.mork.defogger' a:versionCode='0' a:versionName='0'>
+<manifest xmlns:a='http://schemas.android.com/apk/res/android' package='no.mork.android.defogger' a:versionCode='0' a:versionName='0'>
   <uses-sdk a:minSdkVersion="18" />
     <application a:label='Defogger'>
-        <activity a:name='no.mork.defogger.MainActivity'>
+        <activity a:name='no.mork.android.defogger.MainActivity'>
              <intent-filter>
                 <category a:name='android.intent.category.LAUNCHER'/>
                 <action a:name='android.intent.action.MAIN'/>
diff --git a/Defogger/Makefile b/Defogger/Makefile
index d9110a9..7b18967 100644
--- a/Defogger/Makefile
+++ b/Defogger/Makefile
@@ -7,26 +7,27 @@ KEYPASS=123456
 ## dx is renamed in Debian due to naming conflicts:
 DX=dalvik-exchange
 
-API=23
-SDKCLASSPATH=/usr/lib/android-sdk/platforms/android-$(API)/android.jar
-
+APIVER=23
 # This must match whatever dalvik-exchange supports
 JAVAVER=8
 
+SDKCLASSPATH=/usr/lib/android-sdk/platforms/android-$(APIVER)/android.jar
+
 RESOURCES=layout/activity_main.xml values/strings.xml
 RES=$(addprefix res/,$(RESOURCES))
 
-CLASSES=R.class MainActivity.class
+CLASSES=$(addprefix obj/no/mork/android/defogger/,R.class MainActivity.class)
+
 
 all: defogger.apk
 
-src/no/mork/defogger/R.java: AndroidManifest.xml $(RES)
+src/no/mork/android/defogger/R.java: AndroidManifest.xml $(RES)
 	aapt package -f -m -J src -M AndroidManifest.xml -S res -I $(SDKCLASSPATH)
 
-obj/%.class: src/no/mork/defogger/%.java
+obj/%.class: src/%.java
 	javac -d obj -source $(JAVAVER) -target $(JAVAVER) -classpath src -bootclasspath $(SDKCLASSPATH) $<
 
-classes.dex: $(addprefix obj/,$(CLASSES))
+classes.dex: $(CLASSES)
 	$(DX) --dex --output=$@ obj
 
 defogger.apk.unsigned: classes.dex AndroidManifest.xml
@@ -34,11 +35,11 @@ defogger.apk.unsigned: classes.dex AndroidManifest.xml
 	aapt add $@ classes.dex
 
 defogger.keystore:
-	keytool -storepass $(KEYPASS) -keypass $(KEYPASS) -genkeypair -alias defogger -dname "dc=no, dc=mork, cn=defogger" -validity 365 -keystore $@ -keyalg EC -keysize 256 -sigalg SHA256withECDSA
+	keytool -storepass $(KEYPASS) -keypass $(KEYPASS) -genkeypair -alias defogger -dname "dc=no, dc=mork, dc=android, cn=defogger" -validity 365 -keystore $@ -keyalg EC -keysize 256 -sigalg SHA256withECDSA
 
 defogger.apk: defogger.keystore defogger.apk.unsigned
 	apksigner sign --v2-signing-enabled false --ks defogger.keystore --ks-pass "pass:$(KEYPASS)" --key-pass "pass:$(KEYPASS)"  --out $@.unaligned defogger.apk.unsigned
 	zipalign -f 4 $@.unaligned $@
 
 clean:
-	rm -f src/no/mork/defogger/R.java $(addprefix obj/,$(CLASSES)) classes.dex *.unsigned *.unaligned *.apk
+	rm -f src/no/mork/android/defogger/R.java $(CLASSES) classes.dex *.unsigned *.unaligned *.apk
diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java
new file mode 100644
index 0000000..95d1cf5
--- /dev/null
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -0,0 +1,12 @@
+package no.mork.android.defogger;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class MainActivity extends Activity {
+   @Override
+   protected void onCreate(Bundle savedInstanceState) {
+      super.onCreate(savedInstanceState);
+      setContentView(R.layout.activity_main);
+   }
+}
diff --git a/Defogger/src/no/mork/defogger/MainActivity.java b/Defogger/src/no/mork/defogger/MainActivity.java
deleted file mode 100644
index c6e9a63..0000000
--- a/Defogger/src/no/mork/defogger/MainActivity.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package no.mork.defogger;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class MainActivity extends Activity {
-   @Override
-   protected void onCreate(Bundle savedInstanceState) {
-      super.onCreate(savedInstanceState);
-      setContentView(R.layout.activity_main);
-   }
-}
-- 
cgit v1.2.3