diff options
| author | Steven Moreland <smoreland@google.com> | 2018-05-02 18:36:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-02 18:36:57 -0700 |
| commit | aff86c4b6e6c0e5f080ced8abea1dd756988520f (patch) | |
| tree | a5b17eb98b6c4120d5f8e5679f3bd6d13dc3b74f /vintfdata | |
| parent | 47a91566193f9f0d6ba3b79e9f9c6f9b3a5ec3d7 (diff) | |
| parent | e0d4baa8d3ec85ccd46a55049ca48eb670bf8014 (diff) | |
| download | libhidl-aff86c4b6e6c0e5f080ced8abea1dd756988520f.tar.gz | |
Merge "Remove checks from partial manifest build." am: d926bde44a am: c629e66447
am: e0d4baa8d3
Change-Id: Icf5710f90818ab568ce3f14318f6c3215babd492
Diffstat (limited to 'vintfdata')
| -rw-r--r-- | vintfdata/Android.mk | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk index bc7a55a..3db7065 100644 --- a/vintfdata/Android.mk +++ b/vintfdata/Android.mk @@ -62,15 +62,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/vintf GEN := $(local-generated-sources-dir)/manifest.xml -$(GEN): PRIVATE_FLAGS := - -ifeq ($(PRODUCT_ENFORCE_VINTF_MANIFEST),true) -ifdef BUILT_VENDOR_MATRIX -$(GEN): $(BUILT_VENDOR_MATRIX) -$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MATRIX)" -endif -endif - $(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION) $(GEN): PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES := $(FRAMEWORK_MANIFEST_INPUT_FILES) $(GEN): $(FRAMEWORK_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf @@ -78,7 +69,7 @@ $(GEN): $(FRAMEWORK_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \ $(HOST_OUT_EXECUTABLES)/assemble_vintf \ -i $(call normalize-path-list,$(PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES)) \ - -o $@ $(PRIVATE_FLAGS) + -o $@ LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) @@ -86,4 +77,4 @@ BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE) VINTF_VNDK_VERSION := FRAMEWORK_MANIFEST_INPUT_FILES := -DEVICE_MATRIX_INPUT_FILE := +DEVICE_MATRIX_INPUT_FILE :=
\ No newline at end of file |