Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Treat non-integer target SDK as version 10000" into rvc-dev am: 7adb6a1c58

Browse Source 
Change-Id: I67f066baf0b850817fda00c68a21ace85f6bfb3d
This commit is contained in:
Ryan Mitchell
2020-04-30 20:29:11 +00:00
committed by Automerger Merge Worker
parent eae3cdf4f0 7adb6a1c58
commit 0e360fad3b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/aapt2/dump/DumpManifest.cpp
View File

@@ -91,6 +91,7 @@ enum {
}; };
const std::string& kAndroidNamespace = "http://schemas.android.com/apk/res/android"; const std::string& kAndroidNamespace = "http://schemas.android.com/apk/res/android";
constexpr int kCurrentDevelopmentVersion = 10000;
/** Retrieves the attribute of the element with the specified attribute resource id. */ /** Retrieves the attribute of the element with the specified attribute resource id. */
static xml::Attribute* FindAttribute(xml::Element *el, uint32_t resd_id) { static xml::Attribute* FindAttribute(xml::Element *el, uint32_t resd_id) {
@@ -325,7 +326,7 @@ class ManifestExtractor {
ConfigDescription config; ConfigDescription config;
config.orientation = android::ResTable_config::ORIENTATION_PORT; config.orientation = android::ResTable_config::ORIENTATION_PORT;
config.density = android::ResTable_config::DENSITY_MEDIUM; config.density = android::ResTable_config::DENSITY_MEDIUM;
config.sdkVersion = 10000; // Very high. config.sdkVersion = kCurrentDevelopmentVersion; // Very high.
config.screenWidthDp = 320; config.screenWidthDp = 320;
config.screenHeightDp = 480; config.screenHeightDp = 480;
config.smallestScreenWidthDp = 320; config.smallestScreenWidthDp = 320;
@@ -622,6 +623,8 @@ class UsesSdkBadging : public ManifestExtractor::Element {
} }
if (target_sdk) { if (target_sdk) {
extractor()->RaiseTargetSdk(*target_sdk); extractor()->RaiseTargetSdk(*target_sdk);
} else if (target_sdk_name) {
extractor()->RaiseTargetSdk(kCurrentDevelopmentVersion);
} }
} }