release-request-05263112-375a-4b1f-a657-a14bb2a5c5a3-for-git_oc-mr1-release-41... (14dc0371) · Commits · e / os / android_hardware_interfaces

CleanSpec.mk

+5 −1

Original line number	Diff line number	Diff line
		@@ -56,3 +56,7 @@ $(call add-clean-step, rm -rf $(OUT)/soong/.intermediates/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)
		$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 \| xargs -0 rm -f)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.automotive*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.automotive*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.automotive*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.automotive*)

+0 −4

Original line number	Diff line number	Diff line
		@@ -84,8 +84,4 @@ else
		LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
		endif

		ifeq ($(TARGET_USES_BCRADIO_FUTURE_FEATURES),true)
		LOCAL_CFLAGS += -DTARGET_USES_BCRADIO_FUTURE_FEATURES
		endif

		include $(BUILD_EXECUTABLE)

0 → 100644

+3 −0

+2 −14

Original line number	Diff line number	Diff line
		@@ -32,13 +32,7 @@ using android::hardware::audio::effect::V2_0::IEffectsFactory;
		using android::hardware::audio::V2_0::IDevicesFactory;
		using android::hardware::soundtrigger::V2_0::ISoundTriggerHw;
		using android::hardware::registerPassthroughServiceImplementation;
		namespace broadcastradio = android::hardware::broadcastradio;

		#ifdef TARGET_USES_BCRADIO_FUTURE_FEATURES
		static const bool useBroadcastRadioFutureFeatures = true;
		#else
		static const bool useBroadcastRadioFutureFeatures = false;
		#endif
		using android::hardware::broadcastradio::V1_1::IBroadcastRadioFactory;

		using android::OK;

		@@ -52,13 +46,7 @@ int main(int /* argc /, char /* argv */ []) {
		// Soundtrigger and FM radio might be not present.
		status = registerPassthroughServiceImplementation<ISoundTriggerHw>();
		ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status);
		if (useBroadcastRadioFutureFeatures) {
		status = registerPassthroughServiceImplementation<
		broadcastradio::V1_1::IBroadcastRadioFactory>();
		} else {
		status = registerPassthroughServiceImplementation<
		broadcastradio::V1_0::IBroadcastRadioFactory>();
		}
		status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>();
		ALOGE_IF(status != OK, "Error while registering fm radio service: %d", status);
		joinRpcThreadpool();
		return status;

0 → 100644

+3 −0