Fix examples/android code to actually run successfully

bazelbuild · Dec 23, 2020 · c19698b · c19698b
1 parent ae658ea
commit c19698b
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 8 deletions.
diff --git a/examples/android/app/BUILD.bazel b/examples/android/app/BUILD.bazel
@@ -8,6 +8,9 @@ android_binary(
     incremental_dexing = 0,
     manifest = "src/main/AndroidManifest.xml",
     multidex = "native",
+    manifest_values = {
+        "lib_name": "lib",
+    },
     deps = [
         "//lib",
     ],
@@ -20,6 +23,9 @@ android_binary(
     incremental_dexing = 0,
     manifest = "src/main/AndroidManifest.xml",
     multidex = "native",
+    manifest_values = {
+		"lib_name": "lib2",
+	},
     deps = [
         "//lib2",
     ],
@@ -32,6 +38,9 @@ android_binary(
     incremental_dexing = 1,
     manifest = "src/main/AndroidManifest.xml",
     multidex = "native",
+    manifest_values = {
+		"lib_name": "lib",
+	},
     deps = [
         "//lib",
     ],

diff --git a/examples/android/app/src/main/AndroidManifest.xml b/examples/android/app/src/main/AndroidManifest.xml
@@ -2,7 +2,21 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="examples.android.app">
-  <uses-sdk android:minSdkVersion="23"
-      android:targetSdkVersion="23"
-      android:maxSdkVersion="29" />
+	<uses-sdk
+		android:minSdkVersion="23"
+		android:targetSdkVersion="23"
+		android:maxSdkVersion="29" />
+
+	<application
+		android:label="Rules Kotlin App">
+		<activity
+			android:name="examples.android.${lib_name}.MainActivity"
+			android:label="Bazel Tutorial App" >
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+	</application>
+
 </manifest>
diff --git a/examples/android/lib/src/main/AndroidManifest.xml b/examples/android/lib/src/main/AndroidManifest.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="examples.android.lib"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="examples.android.lib">
+	<uses-sdk
+		android:minSdkVersion="23"
+		android:targetSdkVersion="23"
+		android:maxSdkVersion="29" />
+</manifest>
diff --git a/examples/android/lib/src/main/kotlin/examples/android/lib/MainActivity.kt b/examples/android/lib/src/main/kotlin/examples/android/lib/MainActivity.kt
@@ -1,11 +1,11 @@
 package examples.android.lib
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.os.Bundle
 import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams
-import androidx.appcompat.app.AlertDialog
 
 class MainActivity : Activity() {
   override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/examples/android/lib2/BUILD.bazel b/examples/android/lib2/BUILD.bazel
@@ -7,6 +7,7 @@ android_library(
     custom_package = "examples.android.lib2",
     manifest = "src/main/AndroidManifest.xml",
     visibility = ["//visibility:public"],
+    resource_files = glob(["res/**"]),
     deps = [
         ":util",
         "@maven//:androidx_appcompat_appcompat",

diff --git a/examples/android/lib2/src/main/AndroidManifest.xml b/examples/android/lib2/src/main/AndroidManifest.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="examples.android.lib2"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="examples.android.lib2">
+	<uses-sdk
+		android:minSdkVersion="23"
+		android:targetSdkVersion="23"
+		android:maxSdkVersion="29" />
+</manifest>
diff --git a/examples/android/lib2/src/main/java/examples/android/lib2/MainActivity.java b/examples/android/lib2/src/main/java/examples/android/lib2/MainActivity.java
@@ -1,11 +1,11 @@
 package examples.android.lib2;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.os.Bundle;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
-import androidx.appcompat.app.AlertDialog;
 
 public class MainActivity extends Activity {
   @Override protected void onCreate(Bundle savedInstanceState) {
@@ -19,7 +19,7 @@ public class MainActivity extends Activity {
 
     new AlertDialog.Builder(this)
         .setTitle("Blah")
-        .setMessage("Blah blah blah?")
+        .setMessage(R.string.little_bat)
         .show();
   }
 }