Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
3e140bd0
Commit
3e140bd0
authored
Jun 22, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: android, simplify the code, let the users supply the flags
parent
bbb30ce0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
14 deletions
+2
-14
contrib/bootstrap
contrib/bootstrap
+2
-1
contrib/src/main.mak
contrib/src/main.mak
+0
-13
No files found.
contrib/bootstrap
View file @
3e140bd0
...
@@ -188,8 +188,9 @@ check_android_sdk()
...
@@ -188,8 +188,9 @@ check_android_sdk()
{
{
[
-z
"
${
ANDROID_NDK
}
"
]
&&
echo
"You must set ANDROID_NDK environment variable"
&&
exit
1
[
-z
"
${
ANDROID_NDK
}
"
]
&&
echo
"You must set ANDROID_NDK environment variable"
&&
exit
1
add_make
"ANDROID_NDK :=
${
ANDROID_NDK
}
"
add_make
"ANDROID_NDK :=
${
ANDROID_NDK
}
"
[
-z
"
${
ANDROID_ABI
}
"
]
&&
echo
"You must set ANDROID_ABI environment variable"
&&
exit
1
add_make
"ANDROID_ABI :=
${
ANDROID_ABI
}
"
test
-z
"
${
NO_NEON
}
"
&&
add_make_enabled
"HAVE_NEON"
test
-z
"
${
NO_NEON
}
"
&&
add_make_enabled
"HAVE_NEON"
test
-n
"
${
TEGRA2
}
"
&&
add_make_enabled
"HAVE_TEGRA2"
}
}
test
-z
"
$PREFIX
"
||
add_make
"PREFIX :=
$PREFIX
"
test
-z
"
$PREFIX
"
||
add_make
"PREFIX :=
$PREFIX
"
...
...
contrib/src/main.mak
View file @
3e140bd0
...
@@ -102,21 +102,8 @@ endif
...
@@ -102,21 +102,8 @@ endif
ifdef
HAVE_ANDROID
ifdef
HAVE_ANDROID
CC
:=
$(HOST)
-gcc
--sysroot
=
$(ANDROID_NDK)
/platforms/android-9/arch-arm
CC
:=
$(HOST)
-gcc
--sysroot
=
$(ANDROID_NDK)
/platforms/android-9/arch-arm
CXX
:=
$(HOST)
-g
++
--sysroot
=
$(ANDROID_NDK)
/platforms/android-9/arch-arm
CXX
:=
$(HOST)
-g
++
--sysroot
=
$(ANDROID_NDK)
/platforms/android-9/arch-arm
ifdef
HAVE_NEON
ANDROID_ABI
=
armeabi-v7a
ANDROID_CPU_FLAGS
=
-mfpu
=
neon
-mcpu
=
cortex-a8
else
ifdef
HAVE_TEGRA2
ANDROID_ABI
=
armeabi-v7a
ANDROID_CPU_FLAGS
=
-mfpu
=
vfpv3-d16
-mcpu
=
cortex-a9
else
ANDROID_ABI
=
armeabi
ANDROID_CPU_FLAGS
=
-mcpu
=
arm1136jf-s
-mfpu
=
vfp
endif
endif
EXTRA_CFLAGS
+=
-I
$(ANDROID_NDK)
/sources/cxx-stl/gnu-libstdc++/include
EXTRA_CFLAGS
+=
-I
$(ANDROID_NDK)
/sources/cxx-stl/gnu-libstdc++/include
EXTRA_CFLAGS
+=
-I
$(ANDROID_NDK)
/sources/cxx-stl/gnu-libstdc++/libs/
$(ANDROID_ABI)
/include
EXTRA_CFLAGS
+=
-I
$(ANDROID_NDK)
/sources/cxx-stl/gnu-libstdc++/libs/
$(ANDROID_ABI)
/include
EXTRA_CFLAGS
+=
-mfloat-abi
=
softfp
$(ANDROID_CPU_FLAGS)
endif
endif
ifdef
HAVE_MACOSX
ifdef
HAVE_MACOSX
...
...
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