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

Commit 09dd38c8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 0e252720: am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h." 

* commit '0e252720':
  Move frameworks/base/tools/ off AndroidConfig.h.
parents a91dccdf 0e252720

tools/aapt/CrunchCache.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
// This file defines functions laid out and documented in

// This file defines functions laid out and documented in

// CrunchCache.h

// CrunchCache.h





#include <utils/Compat.h>

#include <utils/Vector.h>

#include <utils/Vector.h>

#include <utils/String8.h>

#include <utils/String8.h>

tools/aapt/Main.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "Main.h"

#include "Main.h"

#include "Bundle.h"

#include "Bundle.h"





#include <utils/Compat.h>

#include <utils/Log.h>

#include <utils/Log.h>

#include <utils/threads.h>

#include <utils/threads.h>

#include <utils/List.h>

#include <utils/List.h>

tools/aidl/aidl.cpp

+1 −0
Original line number Original line Diff line number Diff line 




#include "aidl_language.h"

#include "aidl_language.h"

#include "options.h"

#include "options.h"

#include "os.h"

#include "search_path.h"

#include "search_path.h"

#include "Type.h"

#include "Type.h"

#include "generate_java.h"

#include "generate_java.h"

tools/aidl/os.h

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright 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.

 */



#ifndef _FRAMEWORKS_BASE_TOOLS_AIDL_OS_SEP_H_

#define _FRAMEWORKS_BASE_TOOLS_AIDL_OS_SEP_H_



#if defined(_WIN32)

#define OS_PATH_SEPARATOR '\\'

#else

#define OS_PATH_SEPARATOR '/'

#endif



#endif

tools/aidl/search_path.cpp

+1 −0
Original line number Original line Diff line number Diff line 
#include <unistd.h>

#include <unistd.h>

#include "search_path.h"

#include "search_path.h"

#include "options.h"

#include "options.h"

#include "os.h"

#include <string.h>

#include <string.h>





#ifdef HAVE_MS_C_RUNTIME

#ifdef HAVE_MS_C_RUNTIME