diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-04-30 20:19:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-30 20:19:49 +0000 |
| commit | 7adb6a1c58c804f900d1c71fe258acbc18f23f59 (patch) | |
| tree | c3672d8be94c7a3b1f497f806c094b96b7e12973 | |
| parent | 84fdc62021b34e13edebf4e751643c22d7bfed68 (diff) | |
| parent | 95f024289bca153eb562f011e4fe767bc6519c79 (diff) | |
Merge "Treat non-integer target SDK as version 10000" into rvc-dev
| -rw-r--r-- | tools/aapt2/dump/DumpManifest.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/aapt2/dump/DumpManifest.cpp b/tools/aapt2/dump/DumpManifest.cpp index e7a82034c77a..4a6bfd031284 100644 --- a/tools/aapt2/dump/DumpManifest.cpp +++ b/tools/aapt2/dump/DumpManifest.cpp @@ -91,6 +91,7 @@ enum { }; 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. */ static xml::Attribute* FindAttribute(xml::Element *el, uint32_t resd_id) { @@ -325,7 +326,7 @@ class ManifestExtractor { ConfigDescription config; config.orientation = android::ResTable_config::ORIENTATION_PORT; config.density = android::ResTable_config::DENSITY_MEDIUM; - config.sdkVersion = 10000; // Very high. + config.sdkVersion = kCurrentDevelopmentVersion; // Very high. config.screenWidthDp = 320; config.screenHeightDp = 480; config.smallestScreenWidthDp = 320; @@ -622,6 +623,8 @@ class UsesSdkBadging : public ManifestExtractor::Element { } if (target_sdk) { extractor()->RaiseTargetSdk(*target_sdk); + } else if (target_sdk_name) { + extractor()->RaiseTargetSdk(kCurrentDevelopmentVersion); } } |