diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-01-05 05:03:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-05 05:03:48 +0000 |
| commit | 2c1559041d5d30bf4e1d622b2c6924facf2a4daf (patch) | |
| tree | c70089451e810f18fa390fb86dd5672f971c7a8e | |
| parent | 67af5301c1c47a84e405713652a2dc5f5a59ecd6 (diff) | |
| parent | 1d49a53ae5b568ab5010ddead599429c273796a5 (diff) | |
| download | keymaster-2c1559041d5d30bf4e1d622b2c6924facf2a4daf.tar.gz | |
Merge "Add -Wno-error to compile with global -Werror." am: 7516becc84 am: c95fb28810android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: 1d49a53ae5
Change-Id: I3a1a29fb8b0c433d43bb8811b522673e5be5ece6
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := keymaster_qcom.cpp LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/common/inc LOCAL_CFLAGS := $(keymaster-def) +LOCAL_CFLAGS += -Wno-error LOCAL_SHARED_LIBRARIES := \ libcrypto \ |