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

Commit c69611fd authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT2: Follow symlinks when compiling" into oc-dev 

am: 6ea61f9c

Change-Id: I18dc95b8adf503e0bf72e5b48036945dc95312de
parents aa7e6a0d 6ea61f9c

tools/aapt2/cmd/Compile.cpp

+2 −1
Original line number Diff line number Diff line
@@ -478,7 +478,8 @@ static bool CompilePng(IAaptContext* context, const CompileOptions& options, 


  {

    std::string content;

    if (!android::base::ReadFileToString(path_data.source.path, &content)) {

    if (!android::base::ReadFileToString(path_data.source.path, &content,

                                         true /*follow_symlinks*/)) {

      context->GetDiagnostics()->Error(DiagMessage(path_data.source)

                                       << android::base::SystemErrorCodeToString(errno));

      return false;

tools/aapt2/cmd/Link.cpp

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static bool WriteStableIdMapToPath(IDiagnostics* diag, 
static bool LoadStableIdMap(IDiagnostics* diag, const std::string& path,

                            std::unordered_map<ResourceName, ResourceId>* out_id_map) {

  std::string content;

  if (!android::base::ReadFileToString(path, &content)) {

  if (!android::base::ReadFileToString(path, &content, true /*follow_symlinks*/)) {

    diag->Error(DiagMessage(path) << "failed reading stable ID file");

    return false;

  }

tools/aapt2/integration-tests/SymlinkTest/Android.mk

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2017 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.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_PACKAGE_NAME := AaptSymlinkTest

LOCAL_MODULE_TAGS := tests

include $(BUILD_PACKAGE)

tools/aapt2/integration-tests/SymlinkTest/AndroidManifest.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 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.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.aapt.symlinktest" />

tools/aapt2/integration-tests/SymlinkTest/res/drawable/white_3x3.9.png

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../targets/white_3x3.9.png
 
 No newline at end of file