Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9233954c authored by Mark Punzalan's avatar Mark Punzalan
Browse files

aapt2: (De-)Serialize minor version in config 

Bug: 383177182
Test: atest aapt2_tests
Test: Build + boot on Pixel 6 Pro
Test: Manually built APK with minor version in resource config. Verified
the output in aapt2 dump resources/chunks.
Flag: EXEMPT used in host tool (aapt2)

Change-Id: I5bd1d3970493cc47961fe44cfa9fd214a5836551
parent 6d314ced

tools/aapt2/Configuration.proto

+6 −1
Original line number Diff line number Diff line
@@ -202,9 +202,12 @@ message Configuration { 
  // (trackball, wheel, dpad, etc.).

  Navigation navigation = 23;



  // The minimum SDK version of the device.

  // The SDK version of the device.

  uint32 sdk_version = 24;



  // The SDK minor version of the device.

  uint32 sdk_version_minor = 27;



  // Grammatical gender.

  GrammaticalGender grammatical_gender = 26;
@@ -213,4 +216,6 @@ message Configuration { 
  //



  string product = 25;



  reserved 28 to max;  // Next IDs

}

tools/aapt2/format/proto/ProtoDeserialize.cpp

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ bool DeserializeConfigFromPb(const pb::Configuration& pb_config, ConfigDescripti 
  out_config->screenWidth = static_cast<uint16_t>(pb_config.screen_width());

  out_config->screenHeight = static_cast<uint16_t>(pb_config.screen_height());

  out_config->sdkVersion = static_cast<uint16_t>(pb_config.sdk_version());

  out_config->minorVersion = static_cast<uint16_t>(pb_config.sdk_version_minor());

  out_config->grammaticalInflection = pb_config.grammatical_gender();

  return true;

}

tools/aapt2/format/proto/ProtoSerialize.cpp

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ void SerializeConfig(const ConfigDescription& config, pb::Configuration* out_pb_ 
  }



  out_pb_config->set_sdk_version(config.sdkVersion);

  out_pb_config->set_sdk_version_minor(config.minorVersion);



  // The constant values are the same across the structs.

  out_pb_config->set_grammatical_gender(

tools/aapt2/format/proto/ProtoSerialize_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ TEST(ProtoSerializeTest, SerializeDeserializeConfiguration) { 
  ExpectConfigSerializes("300x200");



  ExpectConfigSerializes("v8");

  ExpectConfigSerializes("v19876.23450");



  ExpectConfigSerializes("en-feminine");

  ExpectConfigSerializes("en-neuter-v34");
@@ -588,7 +589,7 @@ TEST(ProtoSerializeTest, SerializeDeserializeConfiguration) { 


  ExpectConfigSerializes(

      "mcc123-mnc456-b+en+GB-masculine-ldltr-sw300dp-w300dp-h400dp-large-long-round-widecg-highdr-"

      "land-car-night-xhdpi-stylus-keysexposed-qwerty-navhidden-dpad-300x200-v23");

      "land-car-night-xhdpi-stylus-keysexposed-qwerty-navhidden-dpad-300x200-v42.1");

}



TEST(ProtoSerializeTest, SerializeAndDeserializeOverlayable) {