diff --git a/Android.mk b/Android.mk
index d24ea3c..84d19ef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libprocess-cpp-minimal
@@ -52,6 +52,12 @@ LOCAL_CFLAGS := \
-std=c++1y
include $(BUILD_EXECUTABLE)
-# The compositor has its Android.mk in its subfolder as it should not
-# depend on any other anbox sources.
-include $(call all-makefiles-under, $(LOCAL_PATH)/android/shared_compositor)
+# Include the Android.mk files below will override LOCAL_PATH so we
+# have to take a copy of it here.
+TMP_PATH := $(LOCAL_PATH)
+
+# The compositor and launcher have their own Android.mk in their subfolders
+# as they should not depend on any other anbox sources.
+# include $(LOCAL_PATH)/android/shared_compositor/Android.mk
+include $(TMP_PATH)/android/launcher/Android.mk
+include $(TMP_PATH)/android/shared_compositor/Android.mk
diff --git a/android/launcher/Android.mk b/android/launcher/Android.mk
new file mode 100644
index 0000000..354fdac
--- /dev/null
+++ b/android/launcher/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := \
+ $(call all-java-files-under src)
+LOCAL_SDK_VERSION := current
+LOCAL_PACKAGE_NAME := AnboxLauncher
+LOCAL_CERTIFICATE := shared
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_OVERRIDES_PACKAGES := Home
+include $(BUILD_PACKAGE)
diff --git a/android/launcher/AndroidManifest.xml b/android/launcher/AndroidManifest.xml
new file mode 100644
index 0000000..596e6f6
--- /dev/null
+++ b/android/launcher/AndroidManifest.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/launcher/src/org/anbox/launcher/Launcher.java b/android/launcher/src/org/anbox/launcher/Launcher.java
new file mode 100644
index 0000000..3cd98b1
--- /dev/null
+++ b/android/launcher/src/org/anbox/launcher/Launcher.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 Simon Fels
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ *
+ */
+
+package org.anbox.launcher;
+
+import android.app.Activity;
+
+/**
+ * Default launcher application.
+ */
+public final class Launcher extends Activity {
+ static final String TAG = "Launcher";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ LauncherApplication app = ((LauncherApplication)getApplication());
+ }
+}
diff --git a/android/launcher/src/org/anbox/launcher/LauncherApplication.java b/android/launcher/src/org/anbox/launcher/LauncherApplication.java
new file mode 100644
index 0000000..629c304
--- /dev/null
+++ b/android/launcher/src/org/anbox/launcher/LauncherApplication.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 Simon Fels
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ *
+ */
+
+package org.anbox.launcher;
+
+import android.app.Application;
+import android.util.Log;
+
+import org.anbox.launcher.R;
+
+public class LauncherApplication extends Application {
+ static final String TAG = "LauncherApplication";
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ }
+}