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

Commit 0b6c39f4 authored by Mark Punzalan's avatar Mark Punzalan
Browse files

Consider flags when merging with overlay semantics 

Bug: 376590133
Flag: EXEMPT Aconfig not supported on host tools
Test: Build+flash+boot
Test: Build passes with changes attached to the bug
Change-Id: Icb2f20372bb28627058e6eb918d91226f66207ff
parent ec52d614

tools/aapt2/link/TableMerger.cpp

+7 −8
Original line number Diff line number Diff line
@@ -207,14 +207,13 @@ static ResourceTable::CollisionResult MergeConfigValue( 
  Value* dst_value = dst_config_value->value.get();

  Value* src_value = src_config_value->value.get();



  CollisionResult collision_result;

  CollisionResult collision_result =

      ResourceTable::ResolveFlagCollision(dst_value->GetFlagStatus(), src_value->GetFlagStatus());

  if (collision_result == CollisionResult::kConflict) {

    if (overlay) {

      collision_result =

          ResolveMergeCollision(override_styles_instead_of_overlaying, dst_value, src_value, pool);

    } else {

    collision_result =

        ResourceTable::ResolveFlagCollision(dst_value->GetFlagStatus(), src_value->GetFlagStatus());

    if (collision_result == CollisionResult::kConflict) {

      collision_result = ResourceTable::ResolveValueCollision(dst_value, src_value);

    }

  }