jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into touch-enable-move

Browse source
This commit is contained in:
Simon Fels 2018-09-15 17:27:05 +02:00 • committed by GitHub
commit 364c8ec933
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 389 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -70,6 +70,12 @@ pkg_check_modules(LXC lxc REQUIRED)
pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED) pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED) pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
message(STATUS "LXC version: ${LXC_VERSION}")
if (${LXC_VERSION} VERSION_LESS 3.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LXC2_SUPPORT")
message(STATUS "Building with LXC 2.x compatibility support")
endif()
option(ENABLE_WAYLAND "Enable wayland support" ON) option(ENABLE_WAYLAND "Enable wayland support" ON)
if (ENABLE_WAYLAND) if (ENABLE_WAYLAND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWAYLAND_SUPPORT") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWAYLAND_SUPPORT")

1
android/camera/media_codecs.xml → android/media/media_codecs.xml
View file

@ -80,5 +80,6 @@ Only the three quirks included above are recognized at this point:
<MediaCodecs> <MediaCodecs>
<Include href="media_codecs_google_audio.xml" /> <Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_google_telephony.xml" /> <Include href="media_codecs_google_telephony.xml" />
<Include href="media_codecs_google_tv.xml" />
<Include href="media_codecs_google_video.xml" /> <Include href="media_codecs_google_video.xml" />
</MediaCodecs> </MediaCodecs>

97
android/media/media_codecs_google_audio.xml Normal file
View file

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<Included>
<Decoders>
<MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg">
<Limit name="channel-count" max="2" />
<Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
<Limit name="bitrate" range="8000-320000" />
</MediaCodec>
<MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp">
<Limit name="channel-count" max="1" />
<Limit name="sample-rate" ranges="8000" />
<Limit name="bitrate" range="4750-12200" />
</MediaCodec>
<MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb">
<Limit name="channel-count" max="1" />
<Limit name="sample-rate" ranges="16000" />
<Limit name="bitrate" range="6600-23850" />
</MediaCodec>
<MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm">
<Limit name="channel-count" max="8" />
<Limit name="sample-rate" ranges="7350,8000,11025,12000,16000,22050,24000,32000,44100,48000" />
<Limit name="bitrate" range="8000-960000" />
</MediaCodec>
<MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw">
<Limit name="channel-count" max="1" />
<Limit name="sample-rate" ranges="8000-48000" />
<Limit name="bitrate" range="64000" />
</MediaCodec>
<MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw">
<Limit name="channel-count" max="1" />
<Limit name="sample-rate" ranges="8000-48000" />
<Limit name="bitrate" range="64000" />
</MediaCodec>
<MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis">
<Limit name="channel-count" max="8" />
<Limit name="sample-rate" ranges="8000-96000" />
<Limit name="bitrate" range="32000-500000" />
</MediaCodec>
<MediaCodec name="OMX.google.opus.decoder" type="audio/opus">
<Limit name="channel-count" max="8" />
<Limit name="sample-rate" ranges="48000" />
<Limit name="bitrate" range="6000-510000" />
</MediaCodec>
<MediaCodec name="OMX.google.raw.decoder" type="audio/raw">
<Limit name="channel-count" max="8" />
<Limit name="sample-rate" ranges="8000-96000" />
<Limit name="bitrate" range="1-10000000" />
</MediaCodec>
<MediaCodec name="OMX.google.flac.decoder" type="audio/flac">
<Limit name="channel-count" max="8" />
<Limit name="sample-rate" ranges="1-655350" />
<Limit name="bitrate" range="1-21000000" />
</MediaCodec>
</Decoders>
<Encoders>
<MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm">
<Limit name="channel-count" max="6" />
<Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
<!-- also may support 64000, 88200 and 96000 Hz -->
<Limit name="bitrate" range="8000-960000" />
</MediaCodec>
<MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp">
<Limit name="channel-count" max="1" />
<Limit name="sample-rate" ranges="8000" />
<Limit name="bitrate" range="4750-12200" />
<Feature name="bitrate-modes" value="CBR" />
</MediaCodec>
<MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb">
<Limit name="channel-count" max="1" />
<Limit name="sample-rate" ranges="16000" />
<Limit name="bitrate" range="6600-23850" />
<Feature name="bitrate-modes" value="CBR" />
</MediaCodec>
<MediaCodec name="OMX.google.flac.encoder" type="audio/flac">
<Limit name="channel-count" max="2" />
<Limit name="sample-rate" ranges="1-655350" />
<Limit name="bitrate" range="1-21000000" />
<Limit name="complexity" range="0-8" default="5" />
<Feature name="bitrate-modes" value="CQ" />
</MediaCodec>
</Encoders>
</Included>

25
android/media/media_codecs_google_telephony.xml Normal file
View file

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<Included>
<Decoders>
<MediaCodec name="OMX.google.gsm.decoder" type="audio/gsm">
<Limit name="channel-count" max="1" />
<Limit name="sample-rate" ranges="8000" />
<Limit name="bitrate" range="13000" />
</MediaCodec>
</Decoders>
</Included>

29
android/media/media_codecs_google_tv.xml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<Included>
<Decoders>
<MediaCodec name="OMX.google.mpeg2.decoder" type="video/mpeg2">
<!-- profiles and levels: ProfileMain : LevelHL -->
<Limit name="size" min="16x16" max="1920x1088" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" range="1-244800" />
<Limit name="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
</Decoders>
</Included>

122
android/media/media_codecs_google_video.xml Normal file
View file

@ -0,0 +1,122 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<Included>
<Decoders>
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es">
<!-- profiles and levels: ProfileSimple : Level3 -->
<Limit name="size" min="2x2" max="352x288" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" range="12-11880" />
<Limit name="bitrate" range="1-384000" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp">
<!-- profiles and levels: ProfileBaseline : Level30, ProfileBaseline : Level45
ProfileISWV2 : Level30, ProfileISWV2 : Level45 -->
<Limit name="size" min="2x2" max="352x288" />
<Limit name="alignment" value="2x2" />
<Limit name="bitrate" range="1-384000" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="OMX.google.h264.decoder" type="video/avc">
<!-- profiles and levels: ProfileHigh : Level52 -->
<Limit name="size" min="2x2" max="4080x4080" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="1-32768" /> <!-- max 4096x2048 equivalent -->
<Limit name="blocks-per-second" range="1-1966080" />
<Limit name="bitrate" range="1-48000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc">
<!-- profiles and levels: ProfileMain : MainTierLevel51 -->
<Limit name="size" min="2x2" max="4096x4096" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="8x8" />
<Limit name="block-count" range="1-196608" /> <!-- max 4096x3072 -->
<Limit name="blocks-per-second" range="1-2000000" />
<Limit name="bitrate" range="1-10000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8">
<Limit name="size" min="2x2" max="2048x2048" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="1-16384" />
<Limit name="blocks-per-second" range="1-1000000" />
<Limit name="bitrate" range="1-40000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9">
<Limit name="size" min="2x2" max="2048x2048" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="1-16384" />
<Limit name="blocks-per-second" range="1-500000" />
<Limit name="bitrate" range="1-40000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
</Decoders>
<Encoders>
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp">
<!-- profiles and levels: ProfileBaseline : Level45 -->
<Limit name="size" min="176x144" max="176x144" />
<Limit name="alignment" value="16x16" />
<Limit name="bitrate" range="1-128000" />
</MediaCodec>
<MediaCodec name="OMX.google.h264.encoder" type="video/avc">
<!-- profiles and levels: ProfileBaseline : Level41 -->
<Limit name="size" min="16x16" max="2048x2048" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="1-8192" /> <!-- max 2048x1024 -->
<Limit name="blocks-per-second" range="1-245760" />
<Limit name="bitrate" range="1-12000000" />
<Feature name="intra-refresh" />
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es">
<!-- profiles and levels: ProfileCore : Level2 -->
<Limit name="size" min="16x16" max="176x144" />
<Limit name="alignment" value="16x16" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" range="12-1485" />
<Limit name="bitrate" range="1-64000" />
</MediaCodec>
<MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8">
<!-- profiles and levels: ProfileMain : Level_Version0-3 -->
<Limit name="size" min="2x2" max="2048x2048" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<!-- 2016 devices can encode at about 10fps at this block count -->
<Limit name="block-count" range="1-16384" />
<Limit name="bitrate" range="1-40000000" />
<Feature name="bitrate-modes" value="VBR,CBR" />
</MediaCodec>
<MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9">
<!-- profiles and levels: ProfileMain : Level_Version0-3 -->
<Limit name="size" min="2x2" max="2048x2048" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<!-- 2016 devices can encode at about 8fps at this block count -->
<Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->
<Limit name="bitrate" range="1-40000000" />
<Feature name="bitrate-modes" value="VBR,CBR" />
</MediaCodec>
</Encoders>
</Included>

0
android/camera/media_profiles.xml → android/media/media_profiles.xml
View file

8
products/anbox.mk
View file

@ -43,8 +43,12 @@ PRODUCT_COPY_FILES += \
vendor/anbox/android/init.goldfish.rc:root/init.goldfish.rc \ vendor/anbox/android/init.goldfish.rc:root/init.goldfish.rc \
vendor/anbox/android/init.goldfish.sh:system/etc/init.goldfish.sh \ vendor/anbox/android/init.goldfish.sh:system/etc/init.goldfish.sh \
vendor/anbox/android/ueventd.goldfish.rc:root/ueventd.goldfish.rc \ vendor/anbox/android/ueventd.goldfish.rc:root/ueventd.goldfish.rc \
vendor/anbox/android/camera/media_profiles.xml:system/etc/media_profiles.xml \ vendor/anbox/android/media/media_profiles.xml:system/etc/media_profiles.xml \
vendor/anbox/android/camera/media_codecs.xml:system/etc/media_codecs.xml \ vendor/anbox/android/media/media_codecs.xml:system/etc/media_codecs.xml \
vendor/anbox/android/media/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
vendor/anbox/android/media/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
vendor/anbox/android/media/media_codecs_google_tv.xml:system/etc/media_codecs_google_tv.xml \
vendor/anbox/android/media/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf
PRODUCT_CHARACTERISTICS := emulator PRODUCT_CHARACTERISTICS := emulator

41
src/anbox/cmds/check_features.cpp
View file

@ -36,6 +36,14 @@ std::vector<std::string> cpu_whitelist = {
"M 460", "M 460",
// Intel Celeron N2840 // Intel Celeron N2840
"N2840", "N2840",
// Intel Core i7 Q720
"Q 720",
// Intel Pentium T4500
"T4500",
// Intel Core i7 Q720
"Q 720",
// Intel Xeon E5520
"E5520"
}; };
} // namespace } // namespace
@ -44,7 +52,7 @@ anbox::cmds::CheckFeatures::CheckFeatures()
cli::Name{"check-features"}, cli::Usage{"check-features"}, cli::Name{"check-features"}, cli::Usage{"check-features"},
cli::Description{"Check that the host system supports all necessary features"}} { cli::Description{"Check that the host system supports all necessary features"}} {
action([](const cli::Command::Context&) { action([this](const cli::Command::Context&) {
#if defined(CPU_FEATURES_ARCH_X86) #if defined(CPU_FEATURES_ARCH_X86)
const auto info = cpu_features::GetX86Info(); const auto info = cpu_features::GetX86Info();
std::vector<std::string> missing_features; std::vector<std::string> missing_features;
@ -70,7 +78,7 @@ anbox::cmds::CheckFeatures::CheckFeatures()
} }
} }
if (missing_features.size() > 0 && !is_whitelisted) { if (missing_features.size() > 0 && !is_whitelisted && !sanity_check_for_features()) {
std::cerr << "The CPU of your computer (" << brand_string << ") does not support all" << std::endl std::cerr << "The CPU of your computer (" << brand_string << ") does not support all" << std::endl
<< "features Anbox requires." << std::endl << "features Anbox requires." << std::endl
<< "It is missing support for the following features: "; << "It is missing support for the following features: ";
@ -97,3 +105,32 @@ anbox::cmds::CheckFeatures::CheckFeatures()
#endif #endif
}); });
} }
// In case that the CPU supports AVX we take the decision as from our analysis
// of the output from the cpu_features library. If it does not we have to check
// further via the compiler builtins if we the CPU supports all mandatory features
// or not. In case that any is missing we will fail the test.
//
// This uses the compiler builtin function __builtin_cpu_supports which allows us
// to detect certain CPU features.
// See https://gcc.gnu.org/onlinedocs/gcc/x86-Built-in-Functions.html
bool anbox::cmds::CheckFeatures::sanity_check_for_features() {
#if defined(CPU_FEATURES_ARCH_X86)
if (__builtin_cpu_supports("avx"))
return true;
std::vector<std::string> missing_features;
#define CHECK_FEATURE(name) \
if (!__builtin_cpu_supports(name)) \
missing_features.push_back(name);
CHECK_FEATURE("sse4.1");
CHECK_FEATURE("sse4.2");
CHECK_FEATURE("ssse3");
return missing_features.empty();
#else
return true;
#endif
}

3
src/anbox/cmds/check_features.h
View file

@ -29,6 +29,9 @@ namespace cmds {
class CheckFeatures : public cli::CommandWithFlagsAndAction { class CheckFeatures : public cli::CommandWithFlagsAndAction {
public: public:
CheckFeatures(); CheckFeatures();
private:
bool sanity_check_for_features();
}; };
} // namespace cmds } // namespace cmds
} // namespace anbox } // namespace anbox

83
src/anbox/container/lxc_container.cpp
View file

@ -24,6 +24,7 @@
#include <map> #include <map>
#include <stdexcept> #include <stdexcept>
#include <fstream> #include <fstream>
#include <sstream>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/throw_exception.hpp> #include <boost/throw_exception.hpp>
@ -46,6 +47,36 @@ constexpr const std::uint32_t default_container_ip_prefix_length{24};
constexpr const char *default_host_ip_address{"192.168.250.1"}; constexpr const char *default_host_ip_address{"192.168.250.1"};
constexpr const char *default_dns_server{"8.8.8.8"}; constexpr const char *default_dns_server{"8.8.8.8"};
#ifdef ENABLE_LXC2_SUPPORT
constexpr const char *lxc_config_idmap_key{"lxc.id_map"};
constexpr const char *lxc_config_net_type_key{"lxc.network.type"};
constexpr const char *lxc_config_net_flags_key{"lxc.network.flags"};
constexpr const char *lxc_config_net_link_key{"lxc.network.link"};
constexpr const char *lxc_config_pty_max_key{"lxc.pts"};
constexpr const char *lxc_config_tty_max_key{"lxc.tty"};
constexpr const char *lxc_config_uts_name_key{"lxc.utsname"};
constexpr const char *lxc_config_tty_dir_key{"lxc.devttydir"};
constexpr const char *lxc_config_init_cmd_key{"lxc.init_cmd"};
constexpr const char *lxc_config_rootfs_path_key{"lxc.rootfs"};
constexpr const char *lxc_config_log_level_key{"lxc.loglevel"};
constexpr const char *lxc_config_log_file_key{"lxc.logfile"};
constexpr const char *lxc_config_apparmor_profile_key{"lxc.aa_profile"};
#else
constexpr const char *lxc_config_idmap_key{"lxc.idmap"};
constexpr const char *lxc_config_net_type_key{"lxc.net.0.type"};
constexpr const char *lxc_config_net_flags_key{"lxc.net.0.flags"};
constexpr const char *lxc_config_net_link_key{"lxc.net.0.link"};
constexpr const char *lxc_config_pty_max_key{"lxc.pty.max"};
constexpr const char *lxc_config_tty_max_key{"lxc.tty.max"};
constexpr const char *lxc_config_uts_name_key{"lxc.uts.name"};
constexpr const char *lxc_config_tty_dir_key{"lxc.tty.dir"};
constexpr const char *lxc_config_init_cmd_key{"lxc.init.cmd"};
constexpr const char *lxc_config_rootfs_path_key{"lxc.rootfs.path"};
constexpr const char *lxc_config_log_level_key{"lxc.log.level"};
constexpr const char *lxc_config_log_file_key{"lxc.log.file"};
constexpr const char *lxc_config_apparmor_profile_key{"lxc.apparmor.profile"};
#endif
constexpr int device_major(__dev_t dev) { constexpr int device_major(__dev_t dev) {
return int(((dev >> 8) & 0xfff) | ((dev >> 32) & (0xfffff000))); return int(((dev >> 8) & 0xfff) | ((dev >> 32) & (0xfffff000)));
} }
@ -87,19 +118,19 @@ void LxcContainer::setup_id_map() {
const auto base_id = unprivileged_uid; const auto base_id = unprivileged_uid;
const auto max_id = 65536; const auto max_id = 65536;
set_config_item("lxc.idmap", utils::string_format("u 0 %d %d", base_id, android_system_uid - 1)); set_config_item(lxc_config_idmap_key, utils::string_format("u 0 %d %d", base_id, android_system_uid - 1));
set_config_item("lxc.idmap", utils::string_format("g 0 %d %d", base_id, android_system_uid - 1)); set_config_item(lxc_config_idmap_key, utils::string_format("g 0 %d %d", base_id, android_system_uid - 1));
// We need to bind the user id for the one running the client side // We need to bind the user id for the one running the client side
// process as he is the owner of various socket files we bind mount // process as he is the owner of various socket files we bind mount
// into the container. // into the container.
set_config_item("lxc.idmap", utils::string_format("u %d %d 1", android_system_uid, creds_.uid())); set_config_item(lxc_config_idmap_key, utils::string_format("u %d %d 1", android_system_uid, creds_.uid()));
set_config_item("lxc.idmap", utils::string_format("g %d %d 1", android_system_uid, creds_.gid())); set_config_item(lxc_config_idmap_key, utils::string_format("g %d %d 1", android_system_uid, creds_.gid()));
set_config_item("lxc.idmap", utils::string_format("u %d %d %d", android_system_uid + 1, set_config_item(lxc_config_idmap_key, utils::string_format("u %d %d %d", android_system_uid + 1,
base_id + android_system_uid + 1, base_id + android_system_uid + 1,
max_id - creds_.uid() - 1)); max_id - creds_.uid() - 1));
set_config_item("lxc.idmap", utils::string_format("g %d %d %d", android_system_uid + 1, set_config_item(lxc_config_idmap_key, utils::string_format("g %d %d %d", android_system_uid + 1,
base_id + android_system_uid + 1, base_id + android_system_uid + 1,
max_id - creds_.gid() - 1)); max_id - creds_.gid() - 1));
} }
@ -110,9 +141,9 @@ void LxcContainer::setup_network() {
return; return;
} }
set_config_item("lxc.net.0.type", "veth"); set_config_item(lxc_config_net_type_key, "veth");
set_config_item("lxc.net.0.flags", "up"); set_config_item(lxc_config_net_flags_key, "up");
set_config_item("lxc.net.0.link", "anbox0"); set_config_item(lxc_config_net_link_key, "anbox0");
// Instead of relying on DHCP we will give Android a static IP configuration // Instead of relying on DHCP we will give Android a static IP configuration
// for the virtual ethernet interface LXC creates for us. This will be bridged // for the virtual ethernet interface LXC creates for us. This will be bridged
@ -271,22 +302,21 @@ void LxcContainer::start(const Configuration &configuration) {
set_config_item("lxc.mount.auto", "proc:mixed sys:mixed cgroup:mixed"); set_config_item("lxc.mount.auto", "proc:mixed sys:mixed cgroup:mixed");
set_config_item("lxc.autodev", "1"); set_config_item("lxc.autodev", "1");
set_config_item("lxc.pty.max", "1024"); set_config_item(lxc_config_pty_max_key, "1024");
set_config_item("lxc.tty.max", "0"); set_config_item(lxc_config_tty_max_key, "0");
set_config_item("lxc.uts.name", "anbox"); set_config_item(lxc_config_uts_name_key, "anbox");
set_config_item("lxc.group.devices.deny", ""); set_config_item("lxc.group.devices.deny", "");
set_config_item("lxc.group.devices.allow", ""); set_config_item("lxc.group.devices.allow", "");
// We can't move bind-mounts, so don't use /dev/lxc/ // We can't move bind-mounts, so don't use /dev/lxc/
set_config_item("lxc.tty.dir", ""); set_config_item(lxc_config_tty_dir_key, "");
set_config_item("lxc.environment", set_config_item("lxc.environment", "PATH=/system/bin:/system/sbin:/system/xbin");
"PATH=/system/bin:/system/sbin:/system/xbin");
set_config_item("lxc.init.cmd", "/anbox-init.sh"); set_config_item(lxc_config_init_cmd_key, "/anbox-init.sh");
#if ENABLE_SNAP_CONFINEMENT #ifdef ENABLE_SNAP_CONFINEMENT
// If we're running inside the snap environment snap-confine already created a // If we're running inside the snap environment snap-confine already created a
// cgroup for us we need to use as otherwise presevering a namespace wont help. // cgroup for us we need to use as otherwise presevering a namespace wont help.
if (utils::is_env_set("SNAP")) if (utils::is_env_set("SNAP"))
@ -298,25 +328,28 @@ void LxcContainer::start(const Configuration &configuration) {
rootfs_path = SystemConfiguration::instance().combined_rootfs_dir(); rootfs_path = SystemConfiguration::instance().combined_rootfs_dir();
DEBUG("Using rootfs path %s", rootfs_path); DEBUG("Using rootfs path %s", rootfs_path);
set_config_item("lxc.rootfs.path", rootfs_path); set_config_item(lxc_config_rootfs_path_key, rootfs_path);
set_config_item("lxc.log.level", "0"); set_config_item(lxc_config_log_level_key, "0");
const auto log_path = SystemConfiguration::instance().log_dir(); const auto log_path = SystemConfiguration::instance().log_dir();
set_config_item("lxc.log.file", utils::string_format("%s/container.log", log_path).c_str()); set_config_item(lxc_config_log_file_key, utils::string_format("%s/container.log", log_path).c_str());
#ifndef ENABLE_LXC2_SUPPORT
// Dump the console output to disk to have a chance to debug early boot problems
set_config_item("lxc.console.logfile", utils::string_format("%s/console.log", log_path).c_str());
set_config_item("lxc.console.rotate", "1");
#endif
// Dump the console output to disk to have a chance to debug early boot problems
set_config_item("lxc.console.logfile", utils::string_format("%s/console.log", log_path).c_str());
set_config_item("lxc.console.rotate", "1");
setup_network(); setup_network();
#if ENABLE_SNAP_CONFINEMENT #ifdef ENABLE_SNAP_CONFINEMENT
// We take the AppArmor profile snapd has defined for us as part of the // We take the AppArmor profile snapd has defined for us as part of the
// anbox-support interface. The container manager itself runs within a // anbox-support interface. The container manager itself runs within a
// child profile snap.anbox.container-manager//lxc too. // child profile snap.anbox.container-manager//lxc too.
set_config_item("lxc.apparmor.profile", "snap.anbox.container-manager//container"); set_config_item("lxc.apparmor.profile", "snap.anbox.container-manager//container");
#else #else
set_config_item("lxc.apparmor.profile", "unconfined"); set_config_item(lxc_config_apparmor_profile_key, "unconfined");
#endif #endif
if (!privileged_) if (!privileged_)

5
src/anbox/platform/sdl/window.cpp
View file

@ -72,8 +72,9 @@ Window::Window(const std::shared_ptr<Renderer> &renderer,
BOOST_THROW_EXCEPTION(std::runtime_error(message)); BOOST_THROW_EXCEPTION(std::runtime_error(message));
} }
if (SDL_SetWindowHitTest(window_, &Window::on_window_hit, this) < 0) if (utils::get_env_value("ANBOX_NO_SDL_WINDOW_HIT_TEST", "false") == "false")
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to register for window hit test")); if (SDL_SetWindowHitTest(window_, &Window::on_window_hit, this) < 0)
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to register for window hit test"));
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); SDL_VERSION(&info.version);