mirror of
https://github.com/badaix/snapcast.git
synced 2025-06-10 23:01:45 +02:00
Android hostname uses ro.product.model as fallback
This commit is contained in:
parent
aa3ce3d5ab
commit
73e42f69cb
2 changed files with 4 additions and 1 deletions
|
@ -13,7 +13,7 @@ fi
|
||||||
if [ -n "$NDK_DIR_ARM" ]; then
|
if [ -n "$NDK_DIR_ARM" ]; then
|
||||||
export NDK_DIR="$NDK_DIR_ARM"
|
export NDK_DIR="$NDK_DIR_ARM"
|
||||||
export ARCH=arm
|
export ARCH=arm
|
||||||
make clean; make TARGET=ANDROID -j 4; $NDK_DIR/bin/arm-linux-android-strip ./snapclient; mv ./snapclient "$ASSETS_DIR/bin/armeabi/"
|
make clean; make TARGET=ANDROID -j 4; $NDK_DIR/bin/arm-linux-androideabi-strip ./snapclient; mv ./snapclient "$ASSETS_DIR/bin/armeabi/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$NDK_DIR_X86" ]; then
|
if [ -n "$NDK_DIR_X86" ]; then
|
||||||
|
|
|
@ -124,6 +124,9 @@ static std::string getHostName()
|
||||||
std::string result = getProp("net.hostname");
|
std::string result = getProp("net.hostname");
|
||||||
if (!result.empty())
|
if (!result.empty())
|
||||||
return result;
|
return result;
|
||||||
|
result = getProp("ro.product.model");
|
||||||
|
if (!result.empty())
|
||||||
|
return result;
|
||||||
#endif
|
#endif
|
||||||
char hostname[1024];
|
char hostname[1024];
|
||||||
hostname[1023] = '\0';
|
hostname[1023] = '\0';
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue