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

Commit 0f60ef81 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Only move private attrs when building framework"

parents 065391ff 22dc5310

tools/aapt2/cmd/Link.cpp

+5 −2
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ using ::android::base::StringPrintf; 


namespace aapt {



constexpr uint8_t kAndroidPackageId = 0x01;



class LinkContext : public IAaptContext {

 public:

  explicit LinkContext(IDiagnostics* diagnostics)
@@ -1805,7 +1807,7 @@ class Linker { 


    // Override the package ID when it is "android".

    if (context_->GetCompilationPackage() == "android") {

      context_->SetPackageId(0x01);

      context_->SetPackageId(kAndroidPackageId);



      // Verify we're building a regular app.

      if (context_->GetPackageType() != PackageType::kApp) {
@@ -1862,7 +1864,8 @@ class Linker { 


    if (context_->GetPackageType() != PackageType::kStaticLib) {

      PrivateAttributeMover mover;

      if (!mover.Consume(context_, &final_table_)) {

      if (context_->GetPackageId() == kAndroidPackageId &&

          !mover.Consume(context_, &final_table_)) {

        context_->GetDiagnostics()->Error(DiagMessage() << "failed moving private attributes");

        return 1;

      }