Merge remote-tracking branch 'origin/android/l/mr1/master' into r1

[android-x86/hardware-intel-libsensors.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 7a276de..f512dd3 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,20 @@
+# Copyright (c) 2015 Intel Corporation
 #
-# Copyright (C) 2014-2015 Intel Corporation.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # IIO sensors HAL module implementation, compiled as hw/iio-sensors-hal.so
 
-ifeq ($(USE_INTEL_SENSOR_HAL),true)
+ifeq ($(USE_IIO_SENSOR_HAL),true)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -38,7 +48,7 @@ LOCAL_LDFLAGS := -Wl,--gc-sections
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_PRELINK_MODULE := false
 LOCAL_SRC_FILES := $(src_files)
-
+LOCAL_PROPRIETARY_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -48,6 +58,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_SRC_FILES := sens.c
 LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_EXECUTABLE)
 
 endif
@@ -55,7 +66,7 @@ endif
 
 # Activity HAL module implementation
 
-ifeq ($(USE_INTEL_ACTIVITY_RECOGNITION_HAL),true)
+ifeq ($(USE_IIO_ACTIVITY_RECOGNITION_HAL),true)
 
 include $(CLEAR_VARS)
 
@@ -65,7 +76,7 @@ activity_src_files := $(src_path)/activity_event_entry.c \
                      $(src_path)/utils.c \
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
-LOCAL_MODULE := activity.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE := activity_recognition.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
@@ -74,7 +85,7 @@ LOCAL_LDFLAGS := -Wl,--gc-sections
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_PRELINK_MODULE := false
 LOCAL_SRC_FILES := $(activity_src_files)
-
+LOCAL_PROPRIETARY_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -84,6 +95,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"Activity\" -fvisibility=hidden
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_SRC_FILES := activity.c
 LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_EXECUTABLE)
 
 endif