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

Commit b629f366 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Rename to match new style"

parents ed9ee581 ce5e56e2

cmds/idmap/inspect.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


#include <androidfw/AssetManager.h>

#include <androidfw/ResourceTypes.h>

#include <utils/ByteOrder.h>

#include <utils/String8.h>



#include <fcntl.h>

include/androidfw/Asset.h

+2 −1
Original line number Diff line number Diff line
@@ -26,11 +26,12 @@ 


#include <utils/Compat.h>

#include <utils/Errors.h>

#include <utils/FileMap.h>

#include <utils/String8.h>



namespace android {



class FileMap;



/*

 * Instances of this class provide read-only operations on a byte stream.

 *

include/androidfw/ResourceTypes.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include <androidfw/Asset.h>

#include <androidfw/LocaleData.h>

#include <utils/ByteOrder.h>

#include <utils/Errors.h>

#include <utils/String16.h>

#include <utils/Vector.h>

include/androidfw/TypeWrappers.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define __TYPE_WRAPPERS_H



#include <androidfw/ResourceTypes.h>

#include <utils/ByteOrder.h>



namespace android {

tools/aapt2/.clang-format

+0 −1
Original line number Diff line number Diff line 
BasedOnStyle: Google

ColumnLimit: 100