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

Commit d47b8c71 authored by Jiyong Park's avatar Jiyong Park
Browse files

resolve merge conflicts of d8a2e2f0 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia7089a9e208961cc581bc7ee28de82e6b73bdccb
parents 237acf48 d8a2e2f0

CleanSpec.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -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/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/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/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*)

tests/bar/1.0/.hidl_for_test

0 → 100644
+0 −0

Empty file added.

tests/bar/1.0/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ genrule { 
    ],

    ],

}

}





cc_library {

cc_test_library {

    name: "android.hardware.tests.bar@1.0",

    name: "android.hardware.tests.bar@1.0",

    defaults: ["hidl-module-defaults"],

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.tests.bar@1.0_genc++"],

    generated_sources: ["android.hardware.tests.bar@1.0_genc++"],

tests/baz/1.0/.hidl_for_test

0 → 100644
+0 −0

Empty file added.

tests/baz/1.0/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ genrule { 
    ],

    ],

}

}





cc_library {

cc_test_library {

    name: "android.hardware.tests.baz@1.0",

    name: "android.hardware.tests.baz@1.0",

    defaults: ["hidl-module-defaults"],

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.tests.baz@1.0_genc++"],

    generated_sources: ["android.hardware.tests.baz@1.0_genc++"],