Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
b74eb3fc
Commit
b74eb3fc
authored
Aug 14, 2012
by
Ying Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retire LOCAL_NDK_VERSION.
Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
parent
4747b03a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
Android.mk
Android.mk
+6
-9
No files found.
Android.mk
View file @
b74eb3fc
...
...
@@ -198,13 +198,12 @@ LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(TARGET_ARCH),arm)
# These are the minimum versions and don't need to be update.
LOCAL_NDK_VERSION := 4
LOCAL_SDK_VERSION := 8
LOCAL_NDK_STL_VARIANT := stlport_static
else
include external/stlport/libstlport.mk
endif
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
# C++ full library
...
...
@@ -247,9 +246,6 @@ LOCAL_C_INCLUDES := \
external/zlib \
$(LOCAL_PATH)/src
LOCAL_SHARED_LIBRARIES := \
libz libstlport
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
# src/google/protobuf/stubs/once.h \
...
...
@@ -266,11 +262,12 @@ LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(TARGET_ARCH),arm)
# These are the minimum versions and don't need to be update.
LOCAL_NDK_VERSION := 4
LOCAL_SDK_VERSION := 8
LOCAL_NDK_STL_VARIANT := stlport_static
else
include external/stlport/libstlport.mk
endif
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
# Android Protocol buffer compiler, aprotoc (host executable)
...
...
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