diff options
| author | Mike McTernan <mikemcternan@google.com> | 2024-02-16 04:36:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 04:36:07 +0000 |
| commit | 32fd4a3c8295d5af49d6203706e5fd889fa89fe7 (patch) | |
| tree | 691008af6b29714bcacbea9cb0c0585a0a3aeeb9 | |
| parent | 9266fc5594992c07437d3f9af2ff94661aabb988 (diff) | |
| parent | 034998f474c9b99d3742d19d6af709896f70c438 (diff) | |
| download | confirmationui-32fd4a3c8295d5af49d6203706e5fd889fa89fe7.tar.gz | |
Original change: https://android-review.googlesource.com/c/trusty/app/confirmationui/+/2882786
Change-Id: I45449c4abaea7f262ade2e7e064648c09617d344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rules.mk | 4 | ||||
| -rw-r--r-- | test/rules.mk | 4 | ||||
| -rw-r--r-- | usertests-inc.mk | 4 |
3 files changed, 11 insertions, 1 deletions
@@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +ifeq (true,$(call TOBOOL,$(CONFIRMATIONUI_DISABLED))) +$(error Trying to build DISABLED confirmationui) +endif + LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) diff --git a/test/rules.mk b/test/rules.mk index aa816d5..e68f2b5 100644 --- a/test/rules.mk +++ b/test/rules.mk @@ -13,6 +13,10 @@ # limitations under the License. # +ifeq (true,$(call TOBOOL,$(CONFIRMATIONUI_DISABLED))) +$(error Trying to build tests for DISABLED confirmationui) +endif + LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) diff --git a/usertests-inc.mk b/usertests-inc.mk index a121f93..46dd2df 100644 --- a/usertests-inc.mk +++ b/usertests-inc.mk @@ -13,5 +13,7 @@ # limitations under the License. # +ifeq (false,$(call TOBOOL,$(CONFIRMATIONUI_DISABLED))) TRUSTY_USER_TESTS += \ - trusty/user/app/confirmationui/test \ + trusty/user/app/confirmationui/test +endif |