summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorElliott Hughes2017-08-02 21:33:04 -0500
committerandroid-build-merger2017-08-02 21:33:04 -0500
commitcb6e5d6ed2e7f5eb77fc8291a0cf8a9a0a08a15b (patch)
treea4f60b5afc0af5154dd8b60eebbbe8f95531b0c6 /trusty
parentdf5ecefde4cd9b4290dd804f4ce27105013114e5 (diff)
parent514464f4caf62f515c95e2465aeeb285d03827c9 (diff)
downloadplatform-system-core-cb6e5d6ed2e7f5eb77fc8291a0cf8a9a0a08a15b.tar.gz
platform-system-core-cb6e5d6ed2e7f5eb77fc8291a0cf8a9a0a08a15b.tar.xz
platform-system-core-cb6e5d6ed2e7f5eb77fc8291a0cf8a9a0a08a15b.zip
Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am: 0915192d8b
am: 514464f4ca Change-Id: Ibbd6515b4a44105e7b965e7b36bc4c3648c7e713
Diffstat (limited to 'trusty')
-rw-r--r--trusty/storage/tests/Android.bp1
1 files changed, 0 insertions, 1 deletions
diff --git a/trusty/storage/tests/Android.bp b/trusty/storage/tests/Android.bp
index 3eff3f27a..1e4fced8f 100644
--- a/trusty/storage/tests/Android.bp
+++ b/trusty/storage/tests/Android.bp
@@ -21,7 +21,6 @@ cc_test {
21 "-g", 21 "-g",
22 "-Wall", 22 "-Wall",
23 "-Werror", 23 "-Werror",
24 "-std=gnu++11",
25 "-Wno-missing-field-initializers", 24 "-Wno-missing-field-initializers",
26 ], 25 ],
27 26