Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
external_aac
Commits
84851b23
Commit
84851b23
authored
10 years ago
by
Dan Albert
Committed by
Gerrit Code Review
10 years ago
Browse files
Options
Download
Plain Diff
Merge "Move back to C++98."
parents
d149516e
d52f3747
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
Android.mk
Android.mk
+2
-1
No files found.
Android.mk
View file @
84851b23
...
...
@@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \
$
(
sbrdec_sources:%
=
libSBRdec/src/%
)
\
$
(
sbrenc_sources:%
=
libSBRenc/src/%
)
LOCAL_CFLAGS
:=
-DANDROID
LOCAL_CFLAGS
+=
-Wno-sequence-point
-Wno-extra
LOCAL_C_INCLUDES
:=
\
...
...
@@ -58,6 +57,8 @@ LOCAL_C_INCLUDES := \
LOCAL_CLANG_CPPFLAGS
+=
\
-Wno-pointer-bool-conversion
LOCAL_CPPFLAGS
+=
-std
=
c++98
LOCAL_MODULE
:=
libFraunhoferAAC
include
$(BUILD_STATIC_LIBRARY)
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment