diff options
| author | Shawn Willden <swillden@google.com> | 2015-05-25 23:12:48 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-05-31 09:28:56 -0600 |
| commit | 0629810b145187575bc26c910dded0d24c64569d (patch) | |
| tree | 5c1309696f2205777f6aad1c1b5b65aeaa64c9b7 /Makefile | |
| parent | 6270aca8571399aca8ea538acd7386ddecdcc112 (diff) | |
| download | android_system_keymaster-0629810b145187575bc26c910dded0d24c64569d.tar.gz android_system_keymaster-0629810b145187575bc26c910dded0d24c64569d.tar.bz2 android_system_keymaster-0629810b145187575bc26c910dded0d24c64569d.zip | |
Another refactor, deleting AbstractFactoryRegistry.
I should have known better than to make these singletons to begin
with. Globals create problems. This undoes that mistake.
Change-Id: Idf61d5f72e3c34b5c4ddb27cc94b05f506561743
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -55,7 +55,6 @@ CXXFLAGS=-Wall -Werror -Wno-unused -Winit-self -Wpointer-arith -Wunused-paramete LDLIBS=-L$(BASE)/../boringssl/build/crypto -lcrypto -lpthread -lstdc++ -lgcov CPPSRCS=\ - abstract_factory_registry_test.cpp \ aead_mode_operation.cpp \ aes_key.cpp \ aes_operation.cpp \ @@ -104,7 +103,7 @@ CSRCS=ocb.c OBJS=$(CPPSRCS:.cpp=.o) $(CCSRCS:.cc=.o) $(CSRCS:.c=.o) DEPS=$(CPPSRCS:.cpp=.d) $(CCSRCS:.cc=.d) $(CSRCS:.c=.d) -BINARIES = abstract_factory_registry_test \ +BINARIES = \ android_keymaster_messages_test \ android_keymaster_test \ authorization_set_test \ @@ -241,11 +240,6 @@ android_keymaster_test: android_keymaster_test.o \ $(BASE)/system/security/keystore/keyblob_utils.o \ $(GTEST_OBJS) -abstract_factory_registry_test: abstract_factory_registry_test.o \ - android_keymaster_utils.o \ - logger.o \ - $(GTEST_OBJS) - keymaster_enforcement_test: keymaster_enforcement_test.o \ android_keymaster_messages.o \ android_keymaster_test_utils.o \ |