Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51f4bac2 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in frameworks/av/services/minijail" am: a09c0d25 am: 60aa845f 

am: 9ca68588

Change-Id: I8c15ed083e02d168bf4e99e831f94005b5179f7c
parents 70fa3f42 9ca68588

services/minijail/Android.mk

+5 −0
Original line number Original line Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

LOCAL_PATH := $(call my-dir)





minijail_common_cflags := -Wall -Werror



# Small library for media.extractor and media.codec sandboxing.

# Small library for media.extractor and media.codec sandboxing.

include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE := libavservices_minijail

LOCAL_MODULE := libavservices_minijail

LOCAL_SRC_FILES := minijail.cpp

LOCAL_SRC_FILES := minijail.cpp

LOCAL_CFLAGS := $(minijail_common_cflags)

LOCAL_SHARED_LIBRARIES := libbase libminijail

LOCAL_SHARED_LIBRARIES := libbase libminijail

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)
@@ -13,6 +16,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := libavservices_minijail_vendor

LOCAL_MODULE := libavservices_minijail_vendor

LOCAL_VENDOR_MODULE := true

LOCAL_VENDOR_MODULE := true

LOCAL_SRC_FILES := minijail.cpp

LOCAL_SRC_FILES := minijail.cpp

LOCAL_CFLAGS := $(minijail_common_cflags)

LOCAL_SHARED_LIBRARIES := libbase libminijail

LOCAL_SHARED_LIBRARIES := libbase libminijail

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)
@@ -21,5 +25,6 @@ include $(BUILD_SHARED_LIBRARY) 
include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE := libavservices_minijail_unittest

LOCAL_MODULE := libavservices_minijail_unittest

LOCAL_SRC_FILES := minijail.cpp av_services_minijail_unittest.cpp

LOCAL_SRC_FILES := minijail.cpp av_services_minijail_unittest.cpp

LOCAL_CFLAGS := $(minijail_common_cflags)

LOCAL_SHARED_LIBRARIES := libbase libminijail

LOCAL_SHARED_LIBRARIES := libbase libminijail

include $(BUILD_NATIVE_TEST)
 
include $(BUILD_NATIVE_TEST)