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

Commit bbd47556 authored by Ying Wang's avatar Ying Wang
Browse files

Cleanups. 

- Deleted unused functions in definitions.mk.
- lint is never fully functional in the platform source tree.
- Retire LOCAL_DIST_BUNDLED_BINARIES: now the build system/framework
  supports JNI embedded in apk.

Change-Id: I6314cb20d1544c704ccbc4c1f9cccb9c54fb5a51
parent 65259743

core/clear_vars.mk

+0 −2
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ LOCAL_CLANG:= 
LOCAL_JAR_EXCLUDE_FILES:=

LOCAL_JAR_PACKAGES:=

LOCAL_JAR_EXCLUDE_PACKAGES:=

LOCAL_LINT_FLAGS:=

LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true

# Don't delete the META_INF dir when merging static Java libraries.

LOCAL_DONT_DELETE_JAR_META_INF:=
@@ -163,7 +162,6 @@ LOCAL_ADDITIONAL_CERTIFICATES:= 
LOCAL_PREBUILT_MODULE_FILE:=

LOCAL_POST_LINK_CMD:=

LOCAL_POST_INSTALL_CMD:=

LOCAL_DIST_BUNDLED_BINARIES:=

LOCAL_HAL_STATIC_LIBRARIES:=

LOCAL_RMTYPEDEFS:=

LOCAL_NO_SYNTAX_CHECK:=

core/config.mk

+0 −1
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ PROGUARD := external/proguard/bin/proguard.sh 
JAVATAGS := build/tools/java-event-log-tags.py

LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)

BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat$(HOST_EXECUTABLE_SUFFIX)

LINT := prebuilts/sdk/tools/lint

RMTYPEDEFS := $(HOST_OUT_EXECUTABLES)/rmtypedefs

APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg

VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

core/definitions.mk

+0 −36
Original line number Diff line number Diff line
@@ -809,42 +809,6 @@ endef 
hide :=

endif



###########################################################

## Dump the variables that are associated with targets

###########################################################



define dump-module-variables

@echo all_dependencies=$^

@echo PRIVATE_YACCFLAGS=$(PRIVATE_YACCFLAGS);

@echo PRIVATE_CFLAGS=$(PRIVATE_CFLAGS);

@echo PRIVATE_CPPFLAGS=$(PRIVATE_CPPFLAGS);

@echo PRIVATE_DEBUG_CFLAGS=$(PRIVATE_DEBUG_CFLAGS);

@echo PRIVATE_C_INCLUDES=$(PRIVATE_C_INCLUDES);

@echo PRIVATE_LDFLAGS=$(PRIVATE_LDFLAGS);

@echo PRIVATE_LDLIBS=$(PRIVATE_LDLIBS);

@echo PRIVATE_ARFLAGS=$(PRIVATE_ARFLAGS);

@echo PRIVATE_AAPT_FLAGS=$(PRIVATE_AAPT_FLAGS);

@echo PRIVATE_DX_FLAGS=$(PRIVATE_DX_FLAGS);

@echo PRIVATE_JAVACFLAGS=$(PRIVATE_JAVACFLAGS);

@echo PRIVATE_JAVA_LIBRARIES=$(PRIVATE_JAVA_LIBRARIES);

@echo PRIVATE_ALL_SHARED_LIBRARIES=$(PRIVATE_ALL_SHARED_LIBRARIES);

@echo PRIVATE_ALL_STATIC_LIBRARIES=$(PRIVATE_ALL_STATIC_LIBRARIES);

@echo PRIVATE_ALL_WHOLE_STATIC_LIBRARIES=$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES);

@echo PRIVATE_ALL_OBJECTS=$(PRIVATE_ALL_OBJECTS);

endef



###########################################################

## Commands for using sed to replace given variable values

###########################################################



define transform-variables

@echo "Sed: $(if $(PRIVATE_MODULE),$(PRIVATE_MODULE),$@) <= $<"

@mkdir -p $(dir $@)

$(hide) sed $(foreach var,$(REPLACE_VARS),-e "s/{{$(var)}}/$(subst /,\/,$(PWD)/$($(var)))/g") $< >$@

$(hide) if [ "$(suffix $@)" = ".sh" ]; then chmod a+rx $@; fi

endef





###########################################################

## Commands for munging the dependency files GCC generates

###########################################################

core/main.mk

+0 −2
Original line number Diff line number Diff line
@@ -1022,8 +1022,6 @@ endif 
endif

endif



.PHONY: lintall



ifneq (,$(filter samplecode, $(MAKECMDGOALS)))

.PHONY: samplecode

sample_MODULES := $(sort $(call get-tagged-modules,samples))

core/package_internal.mk

+0 −33
Original line number Diff line number Diff line
@@ -510,39 +510,6 @@ endif 


PACKAGES := $(PACKAGES) $(LOCAL_PACKAGE_NAME)



# Dist the files that can be bundled in system.img.

# They include the jni shared libraries and the apk with jni libraries stripped.

ifeq ($(LOCAL_DIST_BUNDLED_BINARIES),true)

ifneq ($(filter $(LOCAL_PACKAGE_NAME),$(TARGET_BUILD_APPS)),)

ifneq ($(strip $(jni_shared_libraries)),)

dist_subdir := bundled_$(LOCAL_PACKAGE_NAME)

$(foreach f, $(jni_shared_libraries), \

  $(call dist-for-goals, apps_only, $(f):$(dist_subdir)/$(notdir $(f))))



apk_jni_stripped := $(intermediates)/jni_stripped/package.apk

$(apk_jni_stripped): PRIVATE_JNI_SHARED_LIBRARIES := $(notdir $(jni_shared_libraries))

$(apk_jni_stripped) : $(LOCAL_BUILT_MODULE) | $(ZIPALIGN)

	@rm -rf $(dir $@) && mkdir -p $(dir $@)

	$(hide) cp $< $@

	$(hide) zip -d $@ $(foreach f,$(PRIVATE_JNI_SHARED_LIBRARIES),\*/$(f))

	$(align-package)



$(call dist-for-goals, apps_only, $(apk_jni_stripped):$(dist_subdir)/$(LOCAL_PACKAGE_NAME).apk)



endif  # jni_shared_libraries

endif  # apps_only build

endif  # LOCAL_DIST_BUNDLED_BINARIES



# Lint phony targets

.PHONY: lint-$(LOCAL_PACKAGE_NAME)

lint-$(LOCAL_PACKAGE_NAME): PRIVATE_PATH := $(LOCAL_PATH)

lint-$(LOCAL_PACKAGE_NAME): PRIVATE_LINT_FLAGS := $(LOCAL_LINT_FLAGS)

lint-$(LOCAL_PACKAGE_NAME) :

	@echo lint $(PRIVATE_PATH)

	$(LINT) $(PRIVATE_LINT_FLAGS) $(PRIVATE_PATH)



lintall : lint-$(LOCAL_PACKAGE_NAME)



endif # skip_definition



# Reset internal variables.