| commit | 1e541c22d3552b116f0ab3e3a826f458b2821673 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Jan 29 00:45:57 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jan 29 00:45:57 2015 +0000 |
| tree | 83f863acc22c42158a44b5a9724e2cfa5c1fa567 | |
| parent | 1309477bdaaecc35b468f00045d9b1d005dde377 [diff] | |
| parent | 611a695c2442ca35e55d4a4cf82ca53879a0a344 [diff] |
Merge changes I85f430fb,I514a136b * changes: Remove extraneous 'const' on rescope. Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
diff --git a/tests/keymaster/Android.mk b/tests/keymaster/Android.mk index c420db9..0c11795 100644 --- a/tests/keymaster/Android.mk +++ b/tests/keymaster/Android.mk
@@ -6,9 +6,6 @@ LOCAL_SRC_FILES:= \ keymaster_test.cpp -LOCAL_C_INCLUDES := \ - external/openssl/include \ - LOCAL_SHARED_LIBRARIES := \ liblog \ libutils \