diff options
Diffstat (limited to 'build/nanoapp/app.mk')
| -rw-r--r-- | build/nanoapp/app.mk | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/build/nanoapp/app.mk b/build/nanoapp/app.mk index 14d4a31d..25f7791b 100644 --- a/build/nanoapp/app.mk +++ b/build/nanoapp/app.mk @@ -22,11 +22,6 @@ $(error "The NANOAPP_VERSION variable must be set to the version of the nanoapp. This should be assigned by the Makefile that includes app.mk.") endif -ifeq ($(BUILD_ID),) -# If BUILD_ID is unset this must be a local build. -BUILD_ID = local -endif - NANOAPP_VERSION := $(strip $(NANOAPP_VERSION)) MATCHED_NANOAPP_VERSION := $(shell echo $(NANOAPP_VERSION) \ | grep "^0x[0-9a-fA-F]\{8\}") @@ -70,24 +65,6 @@ IS_NANOAPP_BUILD = true OUTPUT_NAME = $(NANOAPP_NAME) -# Permissions declaration ###################################################### - -ifneq ($(CHRE_NANOAPP_USES_AUDIO),) -COMMON_CFLAGS += -DCHRE_NANOAPP_USES_AUDIO -endif - -ifneq ($(CHRE_NANOAPP_USES_GNSS),) -COMMON_CFLAGS += -DCHRE_NANOAPP_USES_GNSS -endif - -ifneq ($(CHRE_NANOAPP_USES_WIFI),) -COMMON_CFLAGS += -DCHRE_NANOAPP_USES_WIFI -endif - -ifneq ($(CHRE_NANOAPP_USES_WWAN),) -COMMON_CFLAGS += -DCHRE_NANOAPP_USES_WWAN -endif - # Common Compiler Flags ######################################################## # Add the CHRE API to the include search path. @@ -110,12 +87,12 @@ COMMON_CFLAGS += -DNANOAPP_VENDOR_STRING=$(NANOAPP_VENDOR_STRING) COMMON_CFLAGS += -DNANOAPP_NAME_STRING=$(NANOAPP_NAME_STRING) COMMON_CFLAGS += -DNANOAPP_IS_SYSTEM_NANOAPP=$(NANOAPP_IS_SYSTEM_NANOAPP) -# Unstable ID ################################################################## +# Version String ############################################################### COMMIT_HASH_DIRTY_SUFFIX = $(shell git diff --quiet || echo -dirty) COMMIT_HASH = $(shell git log -1 --pretty="format:%h" .)$(COMMIT_HASH_DIRTY_SUFFIX) -NANOAPP_UNSTABLE_ID = "nanoapp=$(NANOAPP_NAME)@$(BUILD_ID)" -COMMON_CFLAGS += -DNANOAPP_UNSTABLE_ID="\"$(NANOAPP_UNSTABLE_ID)\"" +NANOAPP_VERSION_STRING = "nanoapp=$(NANOAPP_NAME)@$(COMMIT_HASH)" +COMMON_CFLAGS += -DNANOAPP_VERSION_STRING="\"$(NANOAPP_VERSION_STRING)\"" # Variant-specific Nanoapp Support Source Files ################################ @@ -134,7 +111,6 @@ GOOGLE_HEXAGONV66_ADSP-SEE_SRCS += $(DSO_SUPPORT_LIB_SRCS) GOOGLE_HEXAGONV66_ADSP-SEE-UIMG_SRCS += $(DSO_SUPPORT_LIB_SRCS) GOOGLE_HEXAGONV66_SLPI-SEE_SRCS += $(DSO_SUPPORT_LIB_SRCS) GOOGLE_HEXAGONV66_SLPI-SEE-UIMG_SRCS += $(DSO_SUPPORT_LIB_SRCS) -GOOGLE_HEXAGONV66_SLPI-QSH_SRCS += $(DSO_SUPPORT_LIB_SRCS) GOOGLE_ARM64_ANDROID_SRCS += $(DSO_SUPPORT_LIB_SRCS) GOOGLE_X86_LINUX_SRCS += $(DSO_SUPPORT_LIB_SRCS) QCOM_HEXAGONV60_NANOHUB_SRCS += $(APP_SUPPORT_PATH)/qcom_nanohub/app_support.cc @@ -142,9 +118,6 @@ QCOM_HEXAGONV60_NANOHUB-UIMG_SRCS += $(APP_SUPPORT_PATH)/qcom_nanohub/app_suppor # Makefile Includes ############################################################ -# Standard library overrides include -include $(CHRE_PREFIX)/std_overrides/std_overrides.mk - # Common includes include $(CHRE_PREFIX)/build/defs.mk include $(CHRE_PREFIX)/build/common.mk @@ -153,9 +126,6 @@ include $(CHRE_PREFIX)/build/common.mk include $(CHRE_PREFIX)/chre_api/chre_api_version.mk # Supported variants includes -ifneq ($(CHRE_TARGET_EXTENSION),) -include $(CHRE_TARGET_EXTENSION) -endif include $(CHRE_PREFIX)/build/variant/google_arm64_android.mk include $(CHRE_PREFIX)/build/variant/google_cm4_nanohub.mk include $(CHRE_PREFIX)/build/variant/google_hexagonv55_slpi-see.mk @@ -170,7 +140,6 @@ include $(CHRE_PREFIX)/build/variant/google_hexagonv66_adsp-see.mk include $(CHRE_PREFIX)/build/variant/google_hexagonv66_adsp-see-uimg.mk include $(CHRE_PREFIX)/build/variant/google_hexagonv66_slpi-see.mk include $(CHRE_PREFIX)/build/variant/google_hexagonv66_slpi-see-uimg.mk -include $(CHRE_PREFIX)/build/variant/google_hexagonv66_slpi-qsh.mk include $(CHRE_PREFIX)/build/variant/google_x86_linux.mk include $(CHRE_PREFIX)/build/variant/qcom_hexagonv60_nanohub.mk include $(CHRE_PREFIX)/build/variant/qcom_hexagonv60_nanohub-uimg.mk |