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

Commit 1cc579ad authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master

parents 44b8a170 0e2ccf21

core/binary.mk

+0 −3
Original line number Diff line number Diff line
@@ -1443,9 +1443,6 @@ endif 
$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



# Default is -fno-rtti.

ifeq ($(strip $(LOCAL_RTTI_FLAG)),)

LOCAL_RTTI_FLAG := -fno-rtti

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

      PLATFORM_SECURITY_PATCH := 2019-02-05

      PLATFORM_SECURITY_PATCH := 2019-03-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH

tools/droiddoc/Android.bp

0 → 100644
+18 −0
Original line number 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",

}