diff options
author | Bjørn Mork <bjorn@mork.no> | 2019-05-16 19:50:45 +0200 |
---|---|---|
committer | Bjørn Mork <bjorn@mork.no> | 2019-05-16 19:53:44 +0200 |
commit | 259f98c8110777ed0c3e9f022cd6bbdcfc736e0d (patch) | |
tree | 829d2640833f40c3012841a87cb2bda5b533a6f4 | |
parent | 209521c6c6a0193440dd35660973c0538c5b273a (diff) |
android: add .android domain component
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r-- | Defogger/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | Defogger/Makefile | 19 | ||||
-rw-r--r-- | Defogger/src/no/mork/android/defogger/MainActivity.java (renamed from Defogger/src/no/mork/defogger/MainActivity.java) | 2 |
3 files changed, 13 insertions, 12 deletions
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/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java index c6e9a63..95d1cf5 100644 --- a/Defogger/src/no/mork/defogger/MainActivity.java +++ b/Defogger/src/no/mork/android/defogger/MainActivity.java @@ -1,4 +1,4 @@ -package no.mork.defogger; +package no.mork.android.defogger; import android.app.Activity; import android.os.Bundle; |