diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-20 10:38:05 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-20 13:07:54 +0100 |
commit | 6770357e47b5fcc1d829e0890a3140c91be16872 (patch) | |
tree | 8ff1eeefb6371640555eb021b66cc97fc235cabe /platform/android/SCsub | |
parent | d8067e905c031df9abe475c966fe389b03036036 (diff) |
Android: Better identify thirdparty C/C++ code
- The `cpu-features.{c,h}` code was only used by chance by the webm
(libvpx) code, so I moved it there. It was actually introduced before
that and wasn't in use, and libvpx just happened to be able to
compile thanks to it being bundled.
It could potentially be compiled on the fly from the Android NDK, but
since we plan to replace the webm module by a GDNative plugin in the
near future, I went the bundling route.
- `ifaddrs_android.h` is already provided in the Android NDK as
`ifaddrs.h`, same as on other Unixes. Yet we cannot use it until we
up the min API level to 24, where `getifaddrs` is first defined.
I moved the files to `thirdparty/misc` and synced them with upstream
WebRTC (only indentation changes and removal of `static` qualifiers).
Also removes dropped thirdparty files from COPYRIGHT.txt after changes
in #24105 and #24145.
Diffstat (limited to 'platform/android/SCsub')
-rw-r--r-- | platform/android/SCsub | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index fb0ec75b16..ad682b9324 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -21,11 +21,6 @@ android_files = [ # 'power_android.cpp' ] -thirdparty_files = [ - 'ifaddrs_android.cpp', - 'cpu-features.c', -] - env_android = env.Clone() if env['target'] == "profile": env_android.Append(CPPFLAGS=['-DPROFILER_ENABLED']) @@ -36,14 +31,10 @@ for x in android_files: env_thirdparty = env_android.Clone() env_thirdparty.disable_warnings() -for x in thirdparty_files: - android_objects.append(env_thirdparty.SharedObject(x)) - -prog = None +android_objects.append(env_thirdparty.SharedObject('#thirdparty/misc/ifaddrs-android.cc')) abspath = env.Dir(".").abspath - with open_utf8(abspath + "/build.gradle.template", "r") as gradle_basein: gradle_text = gradle_basein.read() |