diff options
| author | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | 2018-05-02 16:52:21 +0000 |
|---|---|---|
| committer | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | 2018-05-02 16:52:21 +0000 |
| commit | 614fa5004f1273decdb6f70321cae15637dc104b (patch) | |
| tree | 4843bf06267260d6b3bf736444251ddb990975a0 /tools/aapt2/ResourceValues.cpp | |
| parent | 7c29842c86c8837d8f8dfecd6ca02abe109db9a4 (diff) | |
| parent | 281232d732f7322c8de9fc6802adf1783b488d4f (diff) | |
Snap for 4756951 from 281232d732f7322c8de9fc6802adf1783b488d4f to p-keystone-qcom-release
Change-Id: I90819be0f8d51b132a796589bfb27747d5bc5d16
Diffstat (limited to 'tools/aapt2/ResourceValues.cpp')
| -rw-r--r-- | tools/aapt2/ResourceValues.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp index 6f213e19e5f6..34b46c552e0c 100644 --- a/tools/aapt2/ResourceValues.cpp +++ b/tools/aapt2/ResourceValues.cpp @@ -117,8 +117,7 @@ bool Reference::Equals(const Value* value) const { bool Reference::Flatten(android::Res_value* out_value) const { const ResourceId resid = id.value_or_default(ResourceId(0)); - const bool dynamic = resid.is_valid_dynamic() && resid.package_id() != kFrameworkPackageId && - resid.package_id() < kAppPackageId; + const bool dynamic = resid.is_valid_dynamic() && is_dynamic; if (reference_type == Reference::Type::kResource) { if (dynamic) { |