diff options
| author | Hashcode <hashcode0f@gmail.com> | 2015-01-07 22:42:05 -0800 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2015-02-02 16:30:35 -0800 |
| commit | feff2ab184e8c41a7bdbe9e9e2ccd7d02035c96c (patch) | |
| tree | fa908662b9095dcb9b36c035c167ccfb2be08614 /security/smc_pa_ctrl | |
| parent | 82e6c936c898273febbafcc1a93a9b0ff0363b4d (diff) | |
| download | hardware_ti_omap4-feff2ab184e8c41a7bdbe9e9e2ccd7d02035c96c.zip hardware_ti_omap4-feff2ab184e8c41a7bdbe9e9e2ccd7d02035c96c.tar.gz hardware_ti_omap4-feff2ab184e8c41a7bdbe9e9e2ccd7d02035c96c.tar.bz2 | |
security: misc cleanup
- Align LDFLAGS to previous versions for easier comparison of changes
- Remove Android logging
Change-Id: Ib8242be6be3411fb7277147ca08d68e9fbb45b67
Diffstat (limited to 'security/smc_pa_ctrl')
| -rw-r--r-- | security/smc_pa_ctrl/Android.mk | 14 | ||||
| -rw-r--r-- | security/smc_pa_ctrl/s_version.h | 3 |
2 files changed, 6 insertions, 11 deletions
diff --git a/security/smc_pa_ctrl/Android.mk b/security/smc_pa_ctrl/Android.mk index 0e1e923..0203cad 100644 --- a/security/smc_pa_ctrl/Android.mk +++ b/security/smc_pa_ctrl/Android.mk @@ -1,8 +1,4 @@ -# Only applicable for OMAP4 and OMAP5 boards. -# First eliminate OMAP3 and then ensure that this is not used -# for customer boards -ifneq ($(TARGET_BOARD_PLATFORM),omap3) -ifeq ($(findstring omap, $(TARGET_BOARD_PLATFORM)),omap) +ifeq ($(TARGET_BOARD_PLATFORM),omap4) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -12,14 +8,13 @@ LOCAL_ARM_MODE := arm LOCAL_SRC_FILES:= \ smc_pa_ctrl.c smc_pa_ctrl_linux.c +LOCAL_CFLAGS += -DLINUX +LOCAL_CFLAGS += -D__ANDROID32__ + ifdef S_VERSION_BUILD LOCAL_CFLAGS += -DS_VERSION_BUILD=$(S_VERSION_BUILD) endif -LOCAL_LDLIBS += -llog - -LOCAL_CFLAGS += -DLINUX -LOCAL_CFLAGS += -DANDROID LOCAL_CFLAGS += -I $(LOCAL_PATH)/../tf_sdk/include/ LOCAL_MODULE:= smc_pa_ctrl @@ -27,4 +22,3 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) endif -endif diff --git a/security/smc_pa_ctrl/s_version.h b/security/smc_pa_ctrl/s_version.h index cff19d7..6c779e2 100644 --- a/security/smc_pa_ctrl/s_version.h +++ b/security/smc_pa_ctrl/s_version.h @@ -27,6 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef __S_VERSION_H__ #define __S_VERSION_H__ @@ -44,7 +45,7 @@ #if defined(WIN32) #define S_VERSION_OS "W" /* "W" for Windows PC (XP, Vista…) */ #define S_VERSION_PLATFORM "X" /* "X" for ix86 PC simulators */ -#elif defined(ANDROID) +#elif defined(__ANDROID32__) #define S_VERSION_OS "A" /* "A" for Android */ #define S_VERSION_PLATFORM "G" /* "G" for 4430 */ #elif defined(LINUX) |