diff options
| author | Jiyong Park <jiyong@google.com> | 2017-09-08 08:21:35 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-09-08 08:21:35 +0900 |
| commit | d47b8c7137cbcc1b71aafee91e07944f2f8906bb (patch) | |
| tree | 2acfc8e95fbd564b53fe760532f6457a60d474f0 /CleanSpec.mk | |
| parent | 237acf48faede4978a54846a6070dd296983e8e2 (diff) | |
| parent | d8a2e2f0d478486ce443d6a35d53af041fd4d305 (diff) | |
| download | android_hardware_interfaces-d47b8c7137cbcc1b71aafee91e07944f2f8906bb.tar.gz android_hardware_interfaces-d47b8c7137cbcc1b71aafee91e07944f2f8906bb.tar.bz2 android_hardware_interfaces-d47b8c7137cbcc1b71aafee91e07944f2f8906bb.zip | |
resolve merge conflicts of d8a2e2f0 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia7089a9e208961cc581bc7ee28de82e6b73bdccb
Diffstat (limited to 'CleanSpec.mk')
| -rw-r--r-- | CleanSpec.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 91515abba..e82fefa0d 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -60,3 +60,5 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.auto $(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*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*) |