Minijail: Clean up Makefile.
We don't need to call 'local-generated-sources-dir' in the libminijail
target anymore.
Also fix a path in one comment.
Bug: None
Change-Id: Id56dd59379209ece8835d6978a8bae90be50df7d
diff --git a/Android.mk b/Android.mk
index e14910d..f6f6476 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,11 +14,13 @@
LOCAL_PATH := $(call my-dir)
+
# Common variables
# ========================================================
minijailCommonCFlags := -Wall -Werror
minijailCommonSharedLibraries := libcap
+
# Static library for generated code.
# ========================================================
include $(CLEAR_VARS)
@@ -41,15 +43,12 @@
LOCAL_CLANG := true
include $(BUILD_STATIC_LIBRARY)
+
# libminijail shared library for target.
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libminijail
-# LOCAL_MODULE_CLASS must be defined before calling $(local-generated-sources-dir)
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-intermediates := $(local-generated-sources-dir)
-
LOCAL_CFLAGS := $(minijailCommonCFlags)
LOCAL_CLANG := true
LOCAL_SRC_FILES := \
@@ -64,6 +63,7 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
include $(BUILD_SHARED_LIBRARY)
+
# libminijail native unit tests. Run with:
# adb shell /data/nativetest/libminijail_unittest/libminijail_unittest
# ========================================================
@@ -87,8 +87,9 @@
LOCAL_SHARED_LIBRARIES := $(minijailCommonSharedLibraries)
include $(BUILD_NATIVE_TEST)
+
# Syscall filtering native unit tests. Run with:
-# adb shell /data/nativetest/libminijail_unittest/syscall_filter_unittest
+# adb shell /data/nativetest/syscall_filter_unittest/syscall_filter_unittest
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := syscall_filter_unittest
@@ -108,6 +109,7 @@
LOCAL_SHARED_LIBRARIES := $(minijailCommonSharedLibraries)
include $(BUILD_NATIVE_TEST)
+
# libminijail usage example.
# ========================================================
include $(CLEAR_VARS)
