AAPT2
First checking of AAPT2. The individual phases of AAPT2 work, but there
are some missing pieces.
For early testing we are missing:
- Need to properly mark file references and include them in package
- Need to package into zip
Final AAPT for apps we are missing:
- Need to crush PNGs
- Need to parse 9-patches
- Need to validate all of AndroidManifest.xml
- Need to write align method to align resource tables for splits.
Final AAPT for apps + system we are missing:
- Need to handle overlays
- Need to store comments for R file
- Need to handle --shared-lib (dynamic references too).
New AAPT features coming:
- Need to import compiled libraries
- Name mangling
- R file generation for library code
Change-Id: I95f8a63581b81a1f424ae6fb2c373c883b72c18d
diff --git a/tools/aapt2/ResChunkPullParser.cpp b/tools/aapt2/ResChunkPullParser.cpp
new file mode 100644
index 0000000..78ea60e
--- /dev/null
+++ b/tools/aapt2/ResChunkPullParser.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ResChunkPullParser.h"
+
+#include <androidfw/ResourceTypes.h>
+#include <cstddef>
+
+namespace aapt {
+
+using android::ResChunk_header;
+
+ResChunkPullParser::Event ResChunkPullParser::next() {
+ if (!isGoodEvent(mEvent)) {
+ return mEvent;
+ }
+
+ if (mEvent == Event::StartDocument) {
+ mCurrentChunk = mData;
+ } else {
+ mCurrentChunk = reinterpret_cast<const ResChunk_header*>(
+ reinterpret_cast<const char*>(mCurrentChunk) + mCurrentChunk->size);
+ }
+
+ const std::ptrdiff_t diff = reinterpret_cast<const char*>(mCurrentChunk)
+ - reinterpret_cast<const char*>(mData);
+ assert(diff >= 0 && "diff is negative");
+ const size_t offset = static_cast<const size_t>(diff);
+
+ if (offset == mLen) {
+ mCurrentChunk = nullptr;
+ return (mEvent = Event::EndDocument);
+ } else if (offset + sizeof(ResChunk_header) > mLen) {
+ mLastError = "chunk is past the end of the document";
+ mCurrentChunk = nullptr;
+ return (mEvent = Event::BadDocument);
+ }
+
+ if (mCurrentChunk->headerSize < sizeof(ResChunk_header)) {
+ mLastError = "chunk has too small header";
+ mCurrentChunk = nullptr;
+ return (mEvent = Event::BadDocument);
+ } else if (mCurrentChunk->size < mCurrentChunk->headerSize) {
+ mLastError = "chunk's total size is smaller than header";
+ mCurrentChunk = nullptr;
+ return (mEvent = Event::BadDocument);
+ } else if (offset + mCurrentChunk->size > mLen) {
+ mLastError = "chunk's data extends past the end of the document";
+ mCurrentChunk = nullptr;
+ return (mEvent = Event::BadDocument);
+ }
+ return (mEvent = Event::Chunk);
+}
+
+} // namespace aapt