Update build_apk.sh

build_apk.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# Kullanım: build_apk.sh <work_dir> <app_name> <pkg_name> <keystore>
 set -e
 
 WORK_DIR=$1
@@ -11,14 +10,15 @@ SDK=$ANDROID_SDK_ROOT
 BUILD_TOOLS=$SDK/build-tools/33.0.0
 PLATFORM=$SDK/platforms/android-33/android.jar
 
-# Klasör yapısı
-mkdir -p $WORK_DIR/{src,res/layout,res/values,assets,gen,obj,bin}
+PKG_DIR=$(echo $PKG | tr '.' '/')
+mkdir -p $WORK_DIR/{res/layout,res/values,assets,gen,obj,bin}
+mkdir -p $WORK_DIR/src/$PKG_DIR
 
-# HTML dosyasını assets'e koy
+# HTML assets'e koy
 cp $WORK_DIR/index.html $WORK_DIR/assets/index.html
 
 # AndroidManifest.xml
-cat > $WORK_DIR/AndroidManifest.xml << EOF
+cat > $WORK_DIR/AndroidManifest.xml << MANIFEST
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="${PKG}"
@@ -28,8 +28,7 @@ cat > $WORK_DIR/AndroidManifest.xml << EOF
     <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:label="${APP_NAME}"
-        android:allowBackup="true"
-        android:usesCleartextTraffic="true">
+        android:allowBackup="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -41,64 +40,60 @@ cat > $WORK_DIR/AndroidManifest.xml << EOF
         </activity>
     </application>
 </manifest>
-EOF
+MANIFEST
 
 # strings.xml
-cat > $WORK_DIR/res/values/strings.xml << EOF
+cat > $WORK_DIR/res/values/strings.xml << RES
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">${APP_NAME}</string>
 </resources>
-EOF
+RES
 
-# layout/activity_main.xml
-cat > $WORK_DIR/res/layout/activity_main.xml << EOF
+# activity_main.xml
+cat > $WORK_DIR/res/layout/activity_main.xml << LAYOUT
 <?xml version="1.0" encoding="utf-8"?>
 <WebView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/webview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>
-EOF
-
-# Paketi dizine dönüştür
-PKG_DIR=$(echo $PKG | tr '.' '/')
-mkdir -p $WORK_DIR/src/$PKG_DIR
+LAYOUT
 
 # MainActivity.java
-cat > $WORK_DIR/src/$PKG_DIR/MainActivity.java << EOF
+cat > $WORK_DIR/src/$PKG_DIR/MainActivity.java << JAVA
 package ${PKG};
 import android.app.Activity;
 import android.os.Bundle;
-import android.webkit.*;
+import android.webkit.WebView;
+import android.webkit.WebSettings;
 public class MainActivity extends Activity {
     @Override
-    protected void onCreate(Bundle b) {
-        super.onCreate(b);
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         WebView wv = new WebView(this);
-        setContentView(wv);
         WebSettings ws = wv.getSettings();
         ws.setJavaScriptEnabled(true);
         ws.setDomStorageEnabled(true);
-        ws.setAllowFileAccess(true);
+        setContentView(wv);
         wv.loadUrl("file:///android_asset/index.html");
     }
 }
-EOF
+JAVA
 
-echo "=== 1/5 aapt2 derleme ==="
+echo "=== 1/5 aapt2 compile ==="
 $BUILD_TOOLS/aapt2 compile \
-    --dir $WORK_DIR/res \
+    $WORK_DIR/res/values/strings.xml \
+    $WORK_DIR/res/layout/activity_main.xml \
     -o $WORK_DIR/res_compiled.zip
 
 echo "=== 2/5 aapt2 link ==="
 $BUILD_TOOLS/aapt2 link \
+    $WORK_DIR/res_compiled.zip \
     -I $PLATFORM \
     --manifest $WORK_DIR/AndroidManifest.xml \
-    -o $WORK_DIR/resources.apk \
-    $WORK_DIR/res_compiled.zip \
     --java $WORK_DIR/gen \
     --assets $WORK_DIR/assets \
-    --auto-add-overlay
+    -o $WORK_DIR/resources.apk
 
 echo "=== 3/5 javac ==="
 find $WORK_DIR/gen -name "*.java" > $WORK_DIR/sources.txt
@@ -108,18 +103,16 @@ javac -source 8 -target 8 \
     -d $WORK_DIR/obj \
     @$WORK_DIR/sources.txt
 
-echo "=== 4/5 d8 (dex) ==="
+echo "=== 4/5 d8 ==="
 $BUILD_TOOLS/d8 \
     --output $WORK_DIR/bin \
     --lib $PLATFORM \
     $(find $WORK_DIR/obj -name "*.class")
 
 echo "=== 5/5 APK birleştir + imzala ==="
-# resources.apk içine classes.dex ekle
 cp $WORK_DIR/resources.apk $WORK_DIR/unsigned.apk
 cd $WORK_DIR && zip -j unsigned.apk bin/classes.dex
 
-# imzala
 $BUILD_TOOLS/apksigner sign \
     --ks $KEYSTORE \
     --ks-pass pass:android \
@@ -128,4 +121,4 @@ $BUILD_TOOLS/apksigner sign \
     --out $WORK_DIR/output.apk \
     $WORK_DIR/unsigned.apk
 
-echo "=== APK hazır: $WORK_DIR/output.apk ==="
+echo "=== TAMAM ==="