summaryrefslogtreecommitdiff
path: root/tools/aapt2/AppInfo.h
diff options
context:
space:
mode:
authorRyan Mitchell <rtmitchell@google.com>2018-07-12 11:24:51 -0700
committerRyan Mitchell <rtmitchell@google.com>2018-07-13 23:41:46 +0000
commit5fa2bb14ec6e2a824559909f25e6ea82a2842f5a (patch)
tree0544bf2e6da16b978251407e581a0ad7502c4cb5 /tools/aapt2/AppInfo.h
parent89c9a12826b5d0c52edb97c17ee55c317425d5b8 (diff)
AAPT2: Fix long version code bugs
Refactoring areas in AAPT2 that use android:versionCode to also use abdroid:versionCodeMajor. Does not add versionCodeMajor command line flag yet. Bug: 109883459 Test: aapt2_tests Change-Id: I573fbea37491cf8c5742f9e385c66ee64c4e5166
Diffstat (limited to 'tools/aapt2/AppInfo.h')
-rw-r--r--tools/aapt2/AppInfo.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/aapt2/AppInfo.h b/tools/aapt2/AppInfo.h
index d6f599520d71..75123537116f 100644
--- a/tools/aapt2/AppInfo.h
+++ b/tools/aapt2/AppInfo.h
@@ -31,9 +31,12 @@ struct AppInfo {
// The app's minimum SDK version, if it is defined.
Maybe<int> min_sdk_version;
- // The app's version code, if it is defined.
+ // The app's version code (the lower 32 bits of the long version code), if it is defined.
Maybe<uint32_t> version_code;
+ // The app's version code major (the upper 32 bits of the long version code), if it is defined.
+ Maybe<uint32_t> version_code_major;
+
// The app's revision code, if it is defined.
Maybe<uint32_t> revision_code;