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

Commit 8a397052 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."

parents eba4d231 8ba7af78
Loading
Loading
Loading
Loading
+0 −3
Original line number Original line Diff line number Diff line
@@ -1402,9 +1402,6 @@ endif
$(notice_target): | $(installed_static_library_notice_file_targets)
$(notice_target): | $(installed_static_library_notice_file_targets)
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
$(LOCAL_INSTALLED_MODULE): | $(notice_target)


$(notice_target): | $(installed_static_library_notice_file_targets)
$(LOCAL_INSTALLED_MODULE): | $(notice_target)

# Default is -fno-rtti.
# Default is -fno-rtti.
ifeq ($(strip $(LOCAL_RTTI_FLAG)),)
ifeq ($(strip $(LOCAL_RTTI_FLAG)),)
LOCAL_RTTI_FLAG := -fno-rtti
LOCAL_RTTI_FLAG := -fno-rtti
+18 −0
Original line number Original line Diff line number Diff line
// Copyright (C) 2013 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.

droiddoc_exported_dir {
    name: "droiddoc-templates-pdk",
    path: "templates-pdk",
}