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

Commit 5e904c3d authored by Fabien Sanglard's avatar Fabien Sanglard
Browse files

AAPT2: Delete dead code 

Test: None
Bug: None
Change-Id: Ie8e32e47883ce5e4014e9e902c22aed68af450c4
parent 72f3872b

tools/aapt2/ResourceTable.cpp

+0 −41
Original line number Diff line number Diff line
@@ -355,37 +355,6 @@ bool ResourceTable::AddResourceWithId(const ResourceNameRef& name, const Resourc 
                         (validate_resources_ ? ResolveValueCollision : IgnoreCollision), diag);

}



bool ResourceTable::AddFileReference(const ResourceNameRef& name,

                                     const ConfigDescription& config,

                                     const Source& source,

                                     const StringPiece& path,

                                     IDiagnostics* diag) {

  return AddFileReferenceImpl(name, config, source, path, nullptr,

                              (validate_resources_ ? ResourceNameValidator : SkipNameValidator),

                              diag);

}



bool ResourceTable::AddFileReferenceMangled(const ResourceNameRef& name,

                                            const ConfigDescription& config, const Source& source,

                                            const StringPiece& path, io::IFile* file,

                                            IDiagnostics* diag) {

  return AddFileReferenceImpl(name, config, source, path, file,

                              (validate_resources_ ? ResourceNameValidator : SkipNameValidator),

                              diag);

}



bool ResourceTable::AddFileReferenceImpl(const ResourceNameRef& name,

                                         const ConfigDescription& config, const Source& source,

                                         const StringPiece& path, io::IFile* file,

                                         NameValidator name_validator, IDiagnostics* diag) {

  std::unique_ptr<FileReference> fileRef =

      util::make_unique<FileReference>(string_pool.MakeRef(path));

  fileRef->SetSource(source);

  fileRef->file = file;

  return AddResourceImpl(name, ResourceId{}, config, StringPiece{}, std::move(fileRef),

                         name_validator, ResolveValueCollision, diag);

}



bool ResourceTable::AddResourceMangled(const ResourceNameRef& name, const ConfigDescription& config,

                                       const StringPiece& product, std::unique_ptr<Value> value,

                                       IDiagnostics* diag) {
@@ -510,11 +479,6 @@ bool ResourceTable::SetVisibility(const ResourceNameRef& name, const Visibility& 
  return SetVisibilityImpl(name, visibility, {}, ResourceNameValidator, diag);

}



bool ResourceTable::SetVisibilityMangled(const ResourceNameRef& name, const Visibility& visibility,

                                         IDiagnostics* diag) {

  return SetVisibilityImpl(name, visibility, {}, SkipNameValidator, diag);

}



bool ResourceTable::SetVisibilityWithId(const ResourceNameRef& name, const Visibility& visibility,

                                        const ResourceId& res_id, IDiagnostics* diag) {

  return SetVisibilityImpl(name, visibility, res_id, ResourceNameValidator, diag);
@@ -632,11 +596,6 @@ bool ResourceTable::SetOverlayable(const ResourceNameRef& name, const Overlayabl 
  return SetOverlayableImpl(name, overlayable, ResourceNameValidator, diag);

}



bool ResourceTable::SetOverlayableMangled(const ResourceNameRef& name,

                                          const OverlayableItem& overlayable, IDiagnostics* diag) {

  return SetOverlayableImpl(name, overlayable, SkipNameValidator, diag);

}



bool ResourceTable::SetOverlayableImpl(const ResourceNameRef& name,

                                       const OverlayableItem& overlayable,

                                       NameValidator name_validator, IDiagnostics *diag) {

tools/aapt2/ResourceTable.h

+0 −19
Original line number Diff line number Diff line
@@ -239,13 +239,6 @@ class ResourceTable { 
                         const android::StringPiece& product, std::unique_ptr<Value> value,

                         IDiagnostics* diag);



  bool AddFileReference(const ResourceNameRef& name, const android::ConfigDescription& config,

                        const Source& source, const android::StringPiece& path, IDiagnostics* diag);



  bool AddFileReferenceMangled(const ResourceNameRef& name, const android::ConfigDescription& config,

                               const Source& source, const android::StringPiece& path,

                               io::IFile* file, IDiagnostics* diag);



  // Same as AddResource, but doesn't verify the validity of the name. This is used

  // when loading resources from an existing binary resource table that may have mangled names.

  bool AddResourceMangled(const ResourceNameRef& name, const android::ConfigDescription& config,
@@ -260,8 +253,6 @@ class ResourceTable { 
  bool GetValidateResources();



  bool SetVisibility(const ResourceNameRef& name, const Visibility& visibility, IDiagnostics* diag);

  bool SetVisibilityMangled(const ResourceNameRef& name, const Visibility& visibility,

                            IDiagnostics* diag);

  bool SetVisibilityWithId(const ResourceNameRef& name, const Visibility& visibility,

                           const ResourceId& res_id, IDiagnostics* diag);

  bool SetVisibilityWithIdMangled(const ResourceNameRef& name, const Visibility& visibility,
@@ -269,8 +260,6 @@ class ResourceTable { 


  bool SetOverlayable(const ResourceNameRef& name, const OverlayableItem& overlayable,

                      IDiagnostics *diag);

  bool SetOverlayableMangled(const ResourceNameRef& name, const OverlayableItem& overlayable,

                             IDiagnostics* diag);



  bool SetAllowNew(const ResourceNameRef& name, const AllowNew& allow_new, IDiagnostics* diag);

  bool SetAllowNewMangled(const ResourceNameRef& name, const AllowNew& allow_new,
@@ -333,10 +322,6 @@ class ResourceTable { 
                       NameValidator name_validator, const CollisionResolverFunc& conflict_resolver,

                       IDiagnostics* diag);



  bool AddFileReferenceImpl(const ResourceNameRef& name, const android::ConfigDescription& config,

                            const Source& source, const android::StringPiece& path, io::IFile* file,

                            NameValidator name_validator, IDiagnostics* diag);



  bool SetVisibilityImpl(const ResourceNameRef& name, const Visibility& visibility,

                         const ResourceId& res_id, NameValidator name_validator,

                         IDiagnostics* diag);
@@ -347,10 +332,6 @@ class ResourceTable { 
  bool SetOverlayableImpl(const ResourceNameRef &name, const OverlayableItem& overlayable,

                          NameValidator name_validator, IDiagnostics *diag);



  bool SetSymbolStateImpl(const ResourceNameRef& name, const ResourceId& res_id,

                          const Visibility& symbol, NameValidator name_validator,

                          IDiagnostics* diag);



  // Controls whether the table validates resource names and prevents duplicate resource names

  bool validate_resources_ = true;