diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2019-06-03 13:41:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-03 13:41:47 -0700 |
| commit | c0874fe247a29efeea6362434f5b1060b96da70c (patch) | |
| tree | 3fa9e26c86161b160ddf09555a4ae2bfafb74666 | |
| parent | 9b7de6514b21fa62e41b7101a69cf013c9d4fb47 (diff) | |
| parent | f5671d390d0dfebec37f62bfff7228cd23cd1b59 (diff) | |
Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev
am: f5671d390d
Change-Id: Ie4777d5e7a9f03006b2aef519fc223490ef5bcd2
| -rw-r--r-- | cmds/idmap2/idmap2/Scan.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmds/idmap2/idmap2/Scan.cpp b/cmds/idmap2/idmap2/Scan.cpp index 83c034b4bc42..21c6bd280064 100644 --- a/cmds/idmap2/idmap2/Scan.cpp +++ b/cmds/idmap2/idmap2/Scan.cpp @@ -68,9 +68,10 @@ struct InputOverlay { }; bool VendorIsQOrLater() { - // STOPSHIP(b/119390857): Check api version once Q sdk version is finalized - std::string version = android::base::GetProperty("ro.vndk.version", "Q"); - return version == "Q" || version == "q"; + constexpr int kQSdkVersion = 29; + int version = std::atoi(android::base::GetProperty("ro.vndk.version", "29").data()); + // If the string cannot be parsed, it is a development sdk codename. + return version >= kQSdkVersion || version == 0; } Result<std::unique_ptr<std::vector<std::string>>> FindApkFiles(const std::vector<std::string>& dirs, |